Ticket #38486: 38486.diff

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

@@ -431 +431 @@
                                 $classes[] = 'menu-item-home';
                 }
 
-                // back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
-                if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
+                // Get an array of all public post types.
+                $post_types = get_post_types( array(
+                        'public' => true
+                ) );
+
+                // Remove 'post' from the array of public post types.
+                $post_types = array_diff( $post_types, array( 'post' ) );
+
+                // back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page, non-cpt query.
+                if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id && ! is_post_type_archive() && ! is_singular( $post_types ) )
                         $classes[] = 'current_page_parent';
 
                 $menu_items[$key]->classes = array_unique( $classes );