Changeset 41810

Timestamp:

10/10/2017 05:05:01 PM (7 years ago)

Author:

obenland

Message:

Customizer: Account for legacy menu data

Checks for menu location data from when a previewed theme was previously active.

See #39692.

File:

• trunk/src/wp-includes/class-wp-customize-nav-menus.php (modified) (1 diff)

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

@@ -598 +598 @@
         $mapped_nav_menu_locations = array();
         if ( ! $this->manager->is_theme_active() ) {
-            $mapped_nav_menu_locations = wp_map_nav_menu_locations( get_nav_menu_locations(), $this->original_nav_menu_locations );
+            $theme_mods = get_option( 'theme_mods_' . $this->manager->get_stylesheet(), array() );
+
+            // If there is no data from a previous activation, start fresh.
+            if ( empty( $theme_mods['nav_menu_locations'] ) ) {
+                $theme_mods['nav_menu_locations'] = array();
+            }
+
+            $mapped_nav_menu_locations = wp_map_nav_menu_locations( $theme_mods['nav_menu_locations'], $this->original_nav_menu_locations );
         }