Changeset 42363

Timestamp:

12/04/2017 08:16:43 PM (7 years ago)

Author:

obenland

Message:

Widgets: Don't try mapping empty sidebars.

Fixes a bug where the mapping logic would try mapping empty sidebars, resulting in PHP warnings.

Props ionvv, chetan200891 for initial patch.
See #42603.

Merges [42362] to the 4.9 branch.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/widgets.php (modified) (1 diff)
• tests/phpunit/tests/widgets.php (modified) (2 diffs)

branches/4.9/src/wp-includes/widgets.php

@@ -1295 +1295 @@
     if ( is_array( $old_sidebars_widgets ) ) {
 
+        // Remove empty sidebars, no need to map those.
+        $old_sidebars_widgets = array_filter( $old_sidebars_widgets );
+
         // Only check sidebars that are empty or have not been mapped to yet.
         foreach ( $new_sidebars_widgets as $new_sidebar => $new_widgets ) {

branches/4.9/tests/phpunit/tests/widgets.php

@@ -710 +710 @@
 
         wp_widgets_init();
-        $this->register_sidebars( array( 'sidebar-1', 'sidebar-2', 'sidebar-3', 'wp_inactive_widgets' ) );
+        $this->register_sidebars( array( 'sidebar-1', 'sidebar-2', 'sidebar-3', 'sidebar-4', 'wp_inactive_widgets' ) );
 
         // Test restoring sidebars widgets when previously activated.
@@ -719 +719 @@
                 'sidebar-2' => array(),
                 'sidebar-3' => array( 'unregistered_widget-1', 'text-1', 'media_image-1' ),
+                'sidebar-4' => null, // Should be converted to array.
                 'orphaned_widgets_1' => array( 'media_video-2' ),
             ),