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.

Built from https://develop.svn.wordpress.org/trunk@42026


git-svn-id: http://core.svn.wordpress.org/trunk@41860 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/nav-menu.php

@@ -1124,8 +1124,8 @@ function wp_map_nav_menu_locations( $new_nav_menu_locations, $old_nav_menu_locat
 	 * from within the same group, make an educated guess and map it.
 	 */
 	$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' ),
 	);
 

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-beta4-42025';
+$wp_version = '4.9-beta4-42026';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.