Changeset 58124

Timestamp:

05/09/2024 03:14:46 PM (3 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-includes/nav-menu-template.php.

Includes correcting a conditional in _wp_menu_item_classes_by_context() where $parent_item->object, which contains a string like page, was erroneously compared to the queried object's ID. The correct property to compare is $parent_item->object_id.

Follow-up to [14876], [14923], [14942], [15302], [16731], [16742], [22302], [47550], [47557], [47808].

Props aristath, poena, afercia, SergeyBiryukov.
See #60700.

File:

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

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

@@ -419 +419 @@
             // If the menu item corresponds to the currently queried post or taxonomy object.
         } elseif (
-            $menu_item->object_id == $queried_object_id
+            == $queried_object_id
             && (
                 ( ! empty( $home_page_id ) && 'post_type' === $menu_item->type
-                    && $wp_query->is_home && $home_page_id == $menu_item->object_id )
+                    && $wp_query->is_home && $home_page_id == $menu_item->object_id )
                 || ( 'post_type' === $menu_item->type && $wp_query->is_singular )
                 || ( 'taxonomy' === $menu_item->type
                     && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax )
-                    && $queried_object->taxonomy == $menu_item->object )
+                    && $queried_object->taxonomy == $menu_item->object )
             )
         ) {
@@ -513 +513 @@
 
                 // Give front page item the 'current-menu-item' class when extra query arguments are involved.
-            } elseif ( $item_url == $front_page_url && is_front_page() ) {
+            } elseif ( $item_url == $front_page_url && is_front_page() ) {
                 $classes[] = 'current-menu-item';
             }
 
-            if ( untrailingslashit( $item_url ) == home_url() ) {
+            if ( untrailingslashit( $item_url ) == home_url() ) {
                 $classes[] = 'menu-item-home';
             }
@@ -524 +524 @@
         // 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
+            && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id
         ) {
             $classes[] = 'current_page_parent';
@@ -550 +550 @@
                     && is_post_type_hierarchical( $queried_object->post_type )
                     && in_array( (int) $parent_item->object_id, $queried_object->ancestors, true )
-                    && $parent_item->object != $queried_object->ID
+                    && = $queried_object->ID
                 ) ||
 
@@ -560 +560 @@
                     && (
                         ! isset( $queried_object->term_id ) ||
-                        $parent_item->object_id != $queried_object->term_id
+                        = $queried_object->term_id
                     )
                 )