From c0682ee59bfeaf780282300c2ab0ccee4d91b486 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 22 Sep 2011 02:25:57 +0000 Subject: [PATCH] Detect current menu items for root-relative URLs. props filosofo, fixes #15954. git-svn-id: https://develop.svn.wordpress.org/trunk@18746 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/nav-menu-template.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 21898ab86d..ad6b5aa931 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -360,11 +360,12 @@ 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'] ); + $_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, $_root_relative_current ) ) ) { $classes[] = 'current-menu-item'; $menu_items[$key]->current = true; $_anc_id = (int) $menu_item->db_id;