Ticket #39693: 39693.13.diff

src/wp-includes/theme.php

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

src/wp-includes/widgets.php

@@ -1286 +1286 @@
 
         // 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 ) ) {
 

tests/phpunit/tests/widgets.php

@@ -713 +713 @@
 
                 // 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' ),
+                        ),
                 ) );
 
                 $sidebars_widgets = array(