mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
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
This commit is contained in:
parent
3470faa683
commit
4113ccfc47
@ -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;
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user