Changeset 60732 for trunk/src/wp-includes/widgets.php

Timestamp:

09/12/2025 06:03:16 PM (2 months ago)

Author:

westonruter

Message:

Widgets: Prevent fatal errors in PHP 8 when retrieve_widgets() and wp_map_sidebars_widgets() attempt to merge non-array values.

Props kesselb, lakshyajeet, hellofromTonya, janthiel, ikriv, audrasjb, mtg169, bartnv, pmbaldha, mindctrl, westonruter, jrf.
Fixes #57469.

File:

• trunk/src/wp-includes/widgets.php (modified) (2 diffs)

trunk/src/wp-includes/widgets.php

@@ -1351 +1351 @@
     $sidebars_widgets = wp_map_sidebars_widgets( $sidebars_widgets );
 
+    // Replace non-array values inside the array with an empty array.
+    foreach ( $sidebars_widgets as $key => $value ) {
+        if ( ! is_array( $value ) ) {
+            $sidebars_widgets[ $key ] = array();
+        }
+    }
+
     // Find hidden/lost multi-widget instances.
     $shown_widgets = array_merge( ...array_values( $sidebars_widgets ) );
@@ -1511 +1518 @@
 
         $old_sidebars_widgets = _wp_remove_unregistered_widgets( $old_sidebars_widgets );
+
+        // Replace non-array values inside the array with an empty array.
+        foreach ( $new_sidebars_widgets as $key => $value ) {
+            if ( ! is_array( $value ) ) {
+                $new_sidebars_widgets[ $key ] = array();
+            }
+        }
 
         if ( ! empty( $old_sidebars_widgets ) ) {