From 4113ccfc47d523e50151d6d4a24c8044c47c691b Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 2 May 2016 23:42:28 +0000
Subject: [PATCH] Customize: Handle filtering `sidebars_widgets` when the
 underlying option is non-existent.

Fixes warning related to a non-array argument for `array_merge()` in `WP_Customize_Widgets::customize_register()`.

See [37166].
See #36389.
Fixes #36660.

Built from https://develop.svn.wordpress.org/trunk@37352


git-svn-id: http://core.svn.wordpress.org/trunk@37318 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-widgets.php | 2 +-
 wp-includes/version.php                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php
index 5b3e702ec6..52d174f362 100644
--- a/wp-includes/class-wp-customize-widgets.php
+++ b/wp-includes/class-wp-customize-widgets.php
@@ -1064,7 +1064,7 @@ final class WP_Customize_Widgets {
 	 * @return array
 	 */
 	public function preview_sidebars_widgets( $sidebars_widgets ) {
-		$sidebars_widgets = get_option( 'sidebars_widgets' );
+		$sidebars_widgets = get_option( 'sidebars_widgets', array() );
 
 		unset( $sidebars_widgets['array_version'] );
 		return $sidebars_widgets;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 716a81ff03..3243b86445 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37351';
+$wp_version = '4.6-alpha-37352';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.