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

Timestamp:

10/24/2017 06:34:21 PM (8 years ago)

Author:

obenland

Message:

Customize: Allow previewed menus to be customized

Fixes a bug where menu assignements couldn't be changed when previewing a theme.
Also removes an unnecessary call to menu mapping after a theme switch from the customizer and makes sure the locations option is always written, for good measure.

Props westonruter.
See #39692.

File:

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

trunk/src/wp-includes/theme.php

@@ -695 +695 @@
 
     $nav_menu_locations = get_theme_mod( 'nav_menu_locations' );
-    add_option( 'theme_switch_menu_locations', $nav_menu_locations );
+    update_option( 'theme_switch_menu_locations', $nav_menu_locations );
 
     if ( func_num_args() > 1 ) {
@@ -2725 +2725 @@
         $old_theme = wp_get_theme( $stylesheet );
 
-        // Prevent retrieve_widgets() from running since Customizer already called it up front
+        // Prevent widget & menu mapping from running since Customizer already called it up front
         if ( get_option( 'theme_switched_via_customizer' ) ) {
+            remove_action( 'after_switch_theme', '_wp_menus_changed' );
             remove_action( 'after_switch_theme', '_wp_sidebars_changed' );
             update_option( 'theme_switched_via_customizer', false );