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

Timestamp:

02/24/2018 01:43:07 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Menus: When checking if a Custom Link matches the current URL to add the current-menu-item class, check for decoded URL as well.

Props soulseekah, campusboy1987.
Fixes #43401.

File:

• trunk/src/wp-includes/nav-menu-template.php (modified) (2 diffs)

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

@@ -442 +442 @@
                 $_root_relative_current = strtok( untrailingslashit( $_SERVER['REQUEST_URI'] ), '?' );
             }
+
             $current_url        = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
             $raw_item_url       = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
@@ -447 +448 @@
             $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
 
-            if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
+            $matches = array(
+                $current_url,            urldecode( $current_url ),
+                $_indexless_current,     urldecode( $_indexless_current ),
+                $_root_relative_current, urldecode( $_root_relative_current ),
+            );
+
+            if ( $raw_item_url && in_array( $item_url, $matches ) ) {
                 $classes[]                   = 'current-menu-item';
                 $menu_items[ $key ]->current = true;