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. git-svn-id: https://develop.svn.wordpress.org/trunk@41673 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
32a6ac3918
commit
4666f2fd39
|
@ -690,7 +690,7 @@ function switch_theme( $stylesheet ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( is_array( $_sidebars_widgets ) ) {
|
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' );
|
$nav_menu_locations = get_theme_mod( 'nav_menu_locations' );
|
||||||
|
|
|
@ -1286,6 +1286,7 @@ function wp_map_sidebars_widgets( $existing_sidebars_widgets ) {
|
||||||
|
|
||||||
// Sidebars_widgets settings from when this theme was previously active.
|
// Sidebars_widgets settings from when this theme was previously active.
|
||||||
$old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
|
$old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
|
||||||
|
$old_sidebars_widgets = $old_sidebars_widgets['data'];
|
||||||
|
|
||||||
if ( is_array( $old_sidebars_widgets ) ) {
|
if ( is_array( $old_sidebars_widgets ) ) {
|
||||||
|
|
||||||
|
|
|
@ -713,10 +713,13 @@ class Tests_Widgets extends WP_UnitTestCase {
|
||||||
|
|
||||||
// Test restoring sidebars widgets when previously activated.
|
// Test restoring sidebars widgets when previously activated.
|
||||||
set_theme_mod( 'sidebars_widgets', array(
|
set_theme_mod( 'sidebars_widgets', array(
|
||||||
'sidebar-1' => array( 'tag_cloud-1' ),
|
'time' => time(),
|
||||||
'sidebar-2' => array(),
|
'data' => array(
|
||||||
'sidebar-3' => array( 'unregistered_widget-1', 'text-1', 'media_image-1' ),
|
'sidebar-1' => array( 'tag_cloud-1' ),
|
||||||
'orphaned_widgets_1' => array( 'media_video-2' ),
|
'sidebar-2' => array(),
|
||||||
|
'sidebar-3' => array( 'unregistered_widget-1', 'text-1', 'media_image-1' ),
|
||||||
|
'orphaned_widgets_1' => array( 'media_video-2' ),
|
||||||
|
),
|
||||||
) );
|
) );
|
||||||
|
|
||||||
$sidebars_widgets = array(
|
$sidebars_widgets = array(
|
||||||
|
|
Loading…
Reference in New Issue