Changeset 42732

Timestamp:

02/24/2018 01:43:07 PM (8 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.

Location:

trunk

Files:

• src/wp-includes/nav-menu-template.php (modified) (2 diffs)
• tests/phpunit/tests/post/nav-menu.php (modified) (1 diff)

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;

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

@@ -763 +763 @@
         }
 
+        /**
+         * Provides IRI matching data for _wp_menu_item_classes_by_context() test.
+         */
+        function get_iri_current_menu_items() {
+                return array(
+                        array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ) ),
+                        array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82' ) ),
+                        array( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ),
+                        array( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82' ),
+                        array( '/привет/' ),
+                        array( '/привет' ),
+                );
+        }
+
+        /**
+         * @ticket 43401
+         * @dataProvider get_iri_current_menu_items
+         */
+        function test_iri_current_menu_item( $custom_link, $current = true ) {
+                wp_update_nav_menu_item(
+                        $this->menu_id, 0, array(
+                                'menu-item-status' => 'publish',
+                                'menu-item-type'   => 'custom',
+                                'menu-item-url'    => $custom_link,
+                        )
+                );
+
+                $this->go_to( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ) );
+
+                $menu_items = wp_get_nav_menu_items( $this->menu_id );
+                _wp_menu_item_classes_by_context( $menu_items );
+
+                $classes = $menu_items[0]->classes;
+
+                if ( $current ) {
+                        $this->assertContains( 'current-menu-item', $classes );
+                } else {
+                        $this->assertNotContains( 'current-menu-item', $classes );
+                }
+        }
+
 }