Changeset 33808

Timestamp:

08/30/2015 03:00:45 AM (9 years ago)

Author:

wonderboymusic

Message:

Switching themes: if the new theme doesn't have nav_menu_locations defined, but the old theme does, copy the old theme's nav_menu_locations into the new theme's theme mods.

cc melchoyce

Fixes #18588.

File:

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

trunk/src/wp-includes/theme.php

@@ -689 +689 @@
     }
 
+    $nav_menu_locations = get_theme_mod( 'nav_menu_locations' );
+
     $old_theme  = wp_get_theme();
     $new_theme = wp_get_theme( $stylesheet );
@@ -717 +719 @@
     if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) {
         $default_theme_mods = (array) get_option( 'mods_' . $new_name );
+        if ( ! empty( $nav_menu_locations ) && empty( $default_theme_mods['nav_menu_locations'] ) ) {
+            $default_theme_mods['nav_menu_locations'] = $nav_menu_locations;
+        }
         add_option( "theme_mods_$stylesheet", $default_theme_mods );
     } else {
@@ -726 +731 @@
         if ( 'wp_ajax_customize_save' === current_action() ) {
             remove_theme_mod( 'sidebars_widgets' );
+        }
+
+        if ( ! empty( $nav_menu_locations ) ) {
+            $nav_mods = get_theme_mod( 'nav_menu_locations' );
+            if ( empty( $nav_mods ) ) {
+                set_theme_mod( 'nav_menu_locations', $nav_menu_locations );
+            }
         }
     }