Changeset 41673

Timestamp:

10/02/2017 06:10:06 PM (9 years ago)

Author:

obenland

Message:

Widgets: Revert format of sidebars_widgets.

Restores the data format of the sidebars_widgets theme mod to its pre [41555]
format. It can trigger PHP warnings after switching themes if that mod has not
been removed previously.

Fixes #39693.

Location:

trunk

Files:

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

trunk/src/wp-includes/theme.php

@@ -691 +691 @@
 
         if ( is_array( $_sidebars_widgets ) ) {
-                set_theme_mod( 'sidebars_widgets', $_sidebars_widgets );
+                set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) );
         }
 

trunk/src/wp-includes/widgets.php

@@ -1287 +1287 @@
         // Sidebars_widgets settings from when this theme was previously active.
         $old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
+        $old_sidebars_widgets = $old_sidebars_widgets['data'];
 
         if ( is_array( $old_sidebars_widgets ) ) {

trunk/tests/phpunit/tests/widgets.php

@@ -714 +714 @@
                 // Test restoring sidebars widgets when previously activated.
                 set_theme_mod( 'sidebars_widgets', array(
-                        'sidebar-1' => array( 'tag_cloud-1' ),
-                        'sidebar-2' => array(),
-                        'sidebar-3' => array( 'unregistered_widget-1', 'text-1', 'media_image-1' ),
-                        'orphaned_widgets_1' => array( 'media_video-2' ),
+                        'time' => time(),
+                        'data' => array(
+                                'sidebar-1' => array( 'tag_cloud-1' ),
+                                'sidebar-2' => array(),
+                                'sidebar-3' => array( 'unregistered_widget-1', 'text-1', 'media_image-1' ),
+                                'orphaned_widgets_1' => array( 'media_video-2' ),
+                        ),
                 ) );