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

Timestamp:

12/14/2018 05:15:54 AM (6 years ago)

Author:

desrosj

Message:

Nav Menus: Fix a PHP 7.3 error when switching themes.

When switching themes, wp_map_nav_menu_locations() is used to ensure nav menus are placed in the relevant menu location. Occasionally, menus are registered to locations with numeric slugs, rather than strings. wp_map_nav_menu_locations() assumed it would be the latter, and ran stripos() on those numeric slugs. This behavior is deprecated in PHP 7.3.

As this is the last PHP 7.3 error in unit tests, this commit also removes PHP 7.3 from Travis' allowed_failures list.

Props pento, desrosj, jorbin.

Merges [43899] to trunk.

See #45018.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/nav-menu.php (modified) (2 diffs)

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

@@ -1187 +1187 @@
 
                 // ...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;
                 }
@@ -1198 +1200 @@
 
                         // ... 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;
                         }