Changeset 37352

Timestamp:

05/02/2016 11:41:18 PM (9 years ago)

Author:

westonruter

Message:

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.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-widgets.php (modified) (1 diff)
• tests/phpunit/tests/customize/widgets.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -1065 +1065 @@
      */
     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'] );

trunk/tests/phpunit/tests/customize/widgets.php

@@ -97 +97 @@
         $this->assertInstanceOf( 'WP_Customize_Widgets', $this->manager->widgets );
         $this->assertEquals( $this->manager, $this->manager->widgets->manager );
+    }
+
+    /**
+     * Test registering sidebars without an extant sidebars_widgets option.
+     *
+     * @see WP_Customize_Widgets::customize_register()
+     * @see WP_Customize_Widgets::preview_sidebars_widgets()
+     * @ticket 36660
+     */
+    function test_customize_register_with_deleted_sidebars() {
+        $sidebar_id = 'sidebar-1';
+        delete_option( 'sidebars_widgets' );
+        register_sidebar( array( 'id' => $sidebar_id ) );
+        $this->manager->widgets->customize_register();
+        $this->assertEquals( array_fill_keys( array( 'wp_inactive_widgets', $sidebar_id ), array() ), wp_get_sidebars_widgets() );
     }