Changeset 15320

Timestamp:

06/24/2010 05:39:29 PM (15 years ago)

Author:

ryan

Message:

Fix current page detection for home when index.php is in the requested URL. Props filosofo. fixes #13977 for 3.1

File:

• trunk/wp-includes/nav-menu-template.php (modified) (2 diffs)

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

@@ -352 +352 @@
             $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;
-            if ( $item_url == $current_url ) {
+            $_indexless_current = preg_replace( '/index.php$/', '', $current_url );
+            
+            if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
                 $classes[] = 'current-menu-item';
                 $_anc_id = (int) $menu_item->db_id;
@@ -363 +365 @@
                 }
 
-                if ( untrailingslashit($current_url) == home_url() ) {
+                if ( in_array( home_url(), array( untrailingslashit( $current_url ), untrailingslashit( $_indexless_current ) ) ) ) {
                     // Back compat for home limk to match wp_page_menu()
                     $classes[] = 'current_page_item';