Ticket #35272: 35272.3.diff

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

@@ -334 +334 @@
         $possible_object_parents = array_filter( $possible_object_parents );
 
         $front_page_url = home_url();
+        $front_page_id  = (int) get_option( 'page_on_front' );
 
         foreach ( (array) $menu_items as $key => $menu_item ) {
 
@@ -344 +345 @@
                 $classes[] = 'menu-item-type-' . $menu_item->type;
                 $classes[] = 'menu-item-object-' . $menu_item->object;
 
+                // This menu item is set as the 'Front Page'.
+                if ( $front_page_id === $menu_item->object_id ) {
+                        $classes[] = 'menu-item-home';
+                }
+
                 // if the menu item corresponds to a taxonomy term for the currently-queried non-hierarchical post object
                 if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type && in_array( $menu_item->object_id, $possible_object_parents ) ) {
                         $active_parent_object_ids[] = (int) $menu_item->object_id;
@@ -377 +383 @@
                                 $classes[] = 'current_page_item';
                         }
 
-                        if ( 'page_on_front' ) {
-                                $classes[] = 'menu-item-home';
-                        }
-
                         $active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
                         $active_parent_object_ids[] = (int) $menu_item->post_parent;
                         $active_object = $menu_item->object;