Changeset 41555 for trunk/src/wp-includes/theme.php

Timestamp:

09/21/2017 06:45:03 PM (7 years ago)

Author:

obenland

Message:

Widgets: Improved sidebar mapping on theme switch

Builds on efforts brought forward in #17979.

This will send sidebars through three levels of mapping:

1. If both themes have only one sidebar, that gets mapped.
2. If both themes have sidebars with the same slug, they get mapped.
3. Sidebars that (even partially) match slugs from a similar kind of sidebar will get mapped.

Finally, if the theme has previously been active and we have a record of its
sidebar configuration then, any unmapped sidebar will be restored to its
previous state.

Props westonruter, obenland, alexvorn2, timmydcrawford.
See #39693.

File:

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

trunk/src/wp-includes/theme.php

@@ -682 +682 @@
     $_sidebars_widgets = null;
     if ( 'wp_ajax_customize_save' === current_action() ) {
-        $_sidebars_widgets = $wp_customize->post_value( $wp_customize->get_setting( 'old_sidebars_widgets_data' ) );
+        $old_sidebars_widgets_data_setting = $wp_customize->get_setting( 'old_sidebars_widgets_data' );
+        if ( $old_sidebars_widgets_data_setting ) {
+            $_sidebars_widgets = $wp_customize->post_value( $old_sidebars_widgets_data_setting );
+        }
     } elseif ( is_array( $sidebars_widgets ) ) {
         $_sidebars_widgets = $sidebars_widgets;
@@ -688 +691 @@
 
     if ( is_array( $_sidebars_widgets ) ) {
-        set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) );
+        set_theme_mod( 'sidebars_widgets', $_sidebars_widgets );
     }