Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-10 10:27:57 +01:00
Code Issues Projects Releases Wiki Activity

Customize: Handle filtering sidebars_widgets when the underlying option is non-existent.

Browse Source 
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
This commit is contained in:
Weston Ruter 2016-05-02 23:42:28 +00:00
parent 3470faa683
commit 4113ccfc47
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-customize-widgets.php
View File

@ -1064,7 +1064,7 @@ final class WP_Customize_Widgets {
* @return array * @return array
*/ */
public function preview_sidebars_widgets( $sidebars_widgets ) { 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'] ); unset( $sidebars_widgets['array_version'] );
return $sidebars_widgets; return $sidebars_widgets;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.