From e7c4ac40140375a443505131f33bfc25eeb2b7a9 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Tue, 7 Sep 2010 04:17:37 +0000 Subject: [PATCH] When doing current page highlighting logic, apply untrailingslashit() to everything so that slash additions or omissions still match. fixes #14208. props filosofo git-svn-id: http://svn.automattic.com/wordpress/trunk@15584 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu-template.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 113ae91c0..bf2276e82 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -359,9 +359,9 @@ 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 = ( 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 ) ) ) { $classes[] = 'current-menu-item';