Changeset 42363 for branches/4.9/src/wp-includes/widgets.php

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)

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 ) {