Changeset 41995

Timestamp:

10/24/2017 06:34:21 PM (7 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.

Location:

trunk/src/wp-includes

Files:

• class-wp-customize-nav-menus.php (modified) (2 diffs)
• theme.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -530 +530 @@
      */
     public function customize_register() {
+        $changeset = $this->manager->unsanitized_post_values();
 
         // Preview settings for nav menus early so that the sections and controls will be added properly.
         $nav_menus_setting_ids = array();
-        foreach ( array_keys( $this->manager->unsanitized_post_values() ) as $setting_id ) {
+        foreach ( array_keys( $changeset ) as $setting_id ) {
             if ( preg_match( '/^(nav_menu_locations|nav_menu|nav_menu_item)\[/', $setting_id ) ) {
                 $nav_menus_setting_ids[] = $setting_id;
@@ -628 +629 @@
 
             // Override the assigned nav menu location if mapped during previewed theme switch.
-            if ( isset( $mapped_nav_menu_locations[ $location ] ) ) {
+            if ( empty( $changeset[ $setting_id ] ) && isset( $mapped_nav_menu_locations[ $location ] ) ) {
                 $this->manager->set_post_value( $setting_id, $mapped_nav_menu_locations[ $location ] );
             }

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 );