Changeset 15584

Timestamp:

09/07/2010 04:17:37 AM (14 years ago)

Author:

markjaquith

Message:

When doing current page highlighting logic, apply untrailingslashit() to everything so that slash additions or omissions still match. fixes #14208. props filosofo

File:

• trunk/wp-includes/nav-menu-template.php (modified) (1 diff)

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

@@ -360 +360 @@
         // if the menu item corresponds to the currently-requested URL
         } elseif ( 'custom' == $menu_item->object ) {
-            $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-            $item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
-            $_indexless_current = preg_replace( '/index.php$/', '', $current_url );
+            $current_url = untrailingslashit( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+            $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
+            $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
             
             if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {