sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.


git-svn-id: https://develop.svn.wordpress.org/trunk@42026 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Konstantin Obenland 2017-10-25 22:28:43 +00:00
parent 6f5777ecbf
commit 2ddcc549d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/nav-menu.php
View File

@ -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' ),
);

4
tests/phpunit/tests/menu/nav-menu.php
View File

@ -172,8 +172,8 @@ class Tests_Nav_Menu_Theme_Change extends WP_UnitTestCase {
$new_next_theme_nav_menu_locations = wp_map_nav_menu_locations( $old_next_theme_nav_menu_locations, $prev_theme_nav_menu_locations );
$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 );
}