Changeset 42026

Timestamp:

10/25/2017 10:28:43 PM (7 years ago)

Author:

obenland

Message:

Menus: Add menu-$i slugs to mapping groups

Helps to future proof the feature.
Also orders slugs by popularity to optimize mapping time.

See #39692.

Location:

trunk

Files:

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

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

@@ -1125 +1125 @@
      */
     $common_slug_groups = array(
-        array( 'header', 'main', 'navigation', 'primary', 'top' ),
-        array( 'bottom', 'footer', 'secondary', 'subsidiary' ),
+        array( 'primary', 'menu-1', 'main', 'header', 'navigation', 'top' ),
+        array( 'secondary', 'menu-2', 'footer', 'subsidiary', 'bottom' ),
         array( 'social' ),
     );

trunk/tests/phpunit/tests/menu/nav-menu.php

@@ -173 +173 @@
 
         $expected_nav_menu_locations = array(
-            'main' => 1,
-            'primary' => 2,
+            'primary' => 1,
+            'main' => 2,
         );
         $this->assertEquals( $expected_nav_menu_locations, $new_next_theme_nav_menu_locations );