Ticket #45018: 45018.3.diff

src/wp-includes/nav-menu.php

@@ -1139 +1139 @@
                         foreach ( $registered_nav_menus as $new_location => $name ) {
 
                                 // ...actually match!
-                                if ( false === stripos( $new_location, $slug ) && false === stripos( $slug, $new_location ) ) {
+                                if ( is_string( $new_location ) && false === stripos( $new_location, $slug ) && false === stripos( $slug, $new_location ) ) {
                                         continue;
+                                } elseif ( is_numeric( $new_location ) && $new_location !== $slug ) {
+                                        continue;
                                 }
 
                                 // Then see if any of the old locations...
@@ -1150 +1152 @@
                                         foreach ( $slug_group as $slug ) {
 
                                                 // ... have a match as well.
-                                                if ( false === stripos( $location, $slug ) && false === stripos( $slug, $location ) ) {
+                                                if ( is_string( $location ) && false === stripos( $location, $slug ) && false === stripos( $slug, $location ) ) {
                                                         continue;
+                                                } elseif ( is_numeric( $location ) && $location !== $slug ) {
+                                                        continue;
                                                 }
 
                                                 // Make sure this location wasn't mapped and removed previously.

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

@@ -200 +200 @@
                 );
                 $this->assertEqualSets( $expected_nav_menu_locations, $new_next_theme_nav_menu_locations );
         }
+
+        /**
+         * Technically possible old nav menu locations were registered numerically.
+         *
+         * @covers wp_map_nav_menu_locations()
+         */
+        public function test_numerical_old_locations() {
+                $this->register_nav_menu_locations( array( 'primary', 1 ) );
+
+                $old_nav_menu_locations = array(
+                        'primary'  => 1,
+                        'tertiary' => 2,
+                        0          => 3,
+                );
+
+                $next_theme_nav_menu_locations     = array();
+                $new_next_theme_nav_menu_locations = wp_map_nav_menu_locations( $next_theme_nav_menu_locations, $old_nav_menu_locations );
+
+                $expected_nav_menu_locations = array(
+                        'primary' => 1,
+                        0         => 3,
+                );
+
+                $this->assertEqualSets( $expected_nav_menu_locations, $new_next_theme_nav_menu_locations );
+        }
 }