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

Timestamp:

08/09/2017 09:03:16 PM (7 years ago)

Author:

obenland

Message:

Map nav menu locations on theme switch

This will send nav menu locations through three levels of mapping:

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

Menu locations are mapped for Live Previews in the Customizer and during theme switches.

Props westonruter, obenland, welcher, melchoyce.
Fixes #39692.

File:

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

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

@@ -28 +28 @@
 
     /**
-     * Previewed Menus.
-     *
-     * @since 4.3.0
+     * Original nav menu locations before the theme was switched.
+     *
+     * @since 4.9.0
      * @var array
      */
-    public $previewed_menus;
+    protected $original_nav_menu_locations;
 
     /**
@@ -43 +43 @@
      */
     public function __construct( $manager ) {
-        $this->previewed_menus = array();
-        $this->manager         = $manager;
+        $this->manager = $manager;
+        $this->original_nav_menu_locations = get_nav_menu_locations();
 
         // See https://github.com/xwp/wp-customize-snapshots/blob/962586659688a5b1fd9ae93618b7ce2d4e7a421c/php/class-customize-snapshot-manager.php#L469-L499
@@ -583 +583 @@
         }
 
+        // Attempt to re-map the nav menu location assignments when previewing a theme switch.
+        $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 );
+        }
+
         foreach ( $locations as $location => $description ) {
             $setting_id = "nav_menu_locations[{$location}]";
@@ -599 +605 @@
                     'default'           => 0,
                 ) );
+            }
+
+            // Override the assigned nav menu location if mapped during previewed theme switch.
+            if ( isset( $mapped_nav_menu_locations[ $location ] ) ) {
+                $this->manager->set_post_value( $setting_id, $mapped_nav_menu_locations[ $location ] );
             }