Changeset 18746

Timestamp:

09/22/2011 02:25:57 AM (13 years ago)

Author:

nacin

Message:

Detect current menu items for root-relative URLs. props filosofo, fixes #15954.

File:

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

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

@@ -361 +361 @@
         // if the menu item corresponds to the currently-requested URL
         } elseif ( 'custom' == $menu_item->object ) {
-            $current_url = untrailingslashit( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+            $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
+            $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_root_relative_current;
             $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 ) ) ) {
+            if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
                 $classes[] = 'current-menu-item';
                 $menu_items[$key]->current = true;