WordPress 3.3.2-scripts

[autoinstalls/wordpress.git] / wp-includes / nav-menu-template.php

diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 21898ab86d517214f14c9129e3c04cc9fc24a943..f412c8db4550ae8359204e6da15ea8c15d86c581 100644 (file)
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -360,11 +360,13 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 
                // 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'] );
-                       $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
+                       $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
+                       $current_url = ( is_ssl() ? 'https://' : '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;
+                       $item_url = untrailingslashit( $raw_item_url );
                        $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
 
-                       if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
+                       if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
                                $classes[] = 'current-menu-item';
                                $menu_items[$key]->current = true;
                                $_anc_id = (int) $menu_item->db_id;