Changeset 41811 for trunk/src/wp-includes/nav-menu.php

Timestamp:

10/10/2017 05:07:31 PM (7 years ago)

Author:

obenland

Message:

Menus: Limit mapping to registered locations

Weeds out orphaned locations, so their information will not continue to be mapped to future themes.

Fixes #42121.

File:

• trunk/src/wp-includes/nav-menu.php (modified) (1 diff)

trunk/src/wp-includes/nav-menu.php

@@ -1085 +1085 @@
  */
 function wp_map_nav_menu_locations( $new_nav_menu_locations, $old_nav_menu_locations ) {
-    $registered_nav_menus = get_registered_nav_menus();
+    $registered_nav_menus   = get_registered_nav_menus();
+    $new_nav_menu_locations = array_intersect_key( $new_nav_menu_locations, $registered_nav_menus );
 
     // Short-circuit if there are no old nav menu location assignments to map.