Changeset 58119

Timestamp:

05/08/2024 06:35:10 PM (3 months ago)

Author:

SergeyBiryukov

Message:

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

Follow-up to [14248], [14285], [14878], [15008], [22235], [23897], [23941], [27150].

Props dhruvang21, aristath, poena, afercia, SergeyBiryukov.
Fixes #61160. See #60700.

File:

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

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

@@ -281 +281 @@
     $locations = get_nav_menu_locations();
     foreach ( $locations as $location => $menu_id ) {
-        if ( $menu_id == $menu->term_id ) {
+        if ( $menu_id == $menu->term_id ) {
             $locations[ $location ] = 0;
         }
@@ -332 +332 @@
         ! is_wp_error( $_possible_existing ) &&
         isset( $_possible_existing->term_id ) &&
-        $_possible_existing->term_id != $menu_id
+        $_possible_existing->term_id != $menu_id
     ) {
         return new WP_Error(
@@ -459 +459 @@
     $args = wp_parse_args( $menu_item_data, $defaults );
 
-    if ( 0 == $menu_id ) {
+    if ( 0 == $menu_id ) {
         $args['menu-item-position'] = 1;
-    } elseif ( 0 == (int) $args['menu-item-position'] ) {
-        $menu_items                 = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-        $last_item                  = array_pop( $menu_items );
-        $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : count( $menu_items );
+    } elseif ( 0 === (int) $args['menu-item-position'] ) {
+        $menu_items = array();
+
+        if ( 0 !== $menu_id ) {
+            $menu_items = (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
+        }
+
+        $last_item = array_pop( $menu_items );
+
+        if ( $last_item && isset( $last_item->menu_order ) ) {
+            $args['menu-item-position'] = 1 + $last_item->menu_order;
+        } else {
+            $args['menu-item-position'] = count( $menu_items );
+        }
     }
 
@@ -523 +533 @@
     }
 
-    $update = 0 != $menu_item_db_id;
+    $update = 0 != $menu_item_db_id;
 
     // New menu item. Default is draft status.
@@ -583 +593 @@
     update_post_meta( $menu_item_db_id, '_menu_item_url', sanitize_url( $args['menu-item-url'] ) );
 
-    if ( 0 == $menu_id ) {
+    if ( 0 == $menu_id ) {
         update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
     } elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) ) {
@@ -1060 +1070 @@
                 'taxonomy' === $object_type &&
                 'taxonomy' === $menu_item_type &&
-                get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy
+                get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy
             ) {
                 $menu_item_ids[] = (int) $menu_item->ID;
@@ -1147 +1157 @@
         }
         foreach ( $items as $item ) {
-            if ( $post->ID == $item->object_id ) {
+            if ( $post->ID == $item->object_id ) {
                 continue 2;
             }