Changeset 47557 for trunk/src/wp-admin/includes/nav-menu.php

Timestamp:

04/09/2020 03:41:04 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search().

This addresses all the remaining WordPress.PHP.StrictInArray.MissingTrueStrict issues in core.

Includes minor code layout fixes for better readability.

Follow-up to [47550].

See #49542.

File:

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

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

@@ -1150 +1150 @@
                 )
         );
-        $messages            = array();
-        $menu_items          = array();
+
+        $messages   = array();
+        $menu_items = array();
+
         // Index menu items by DB ID.
         foreach ( $unsorted_menu_items as $_item ) {
@@ -1174 +1176 @@
 
         wp_defer_term_counting( true );
+
         // Loop through all the menu items' POST variables.
         if ( ! empty( $_POST['menu-item-db-id'] ) ) {
@@ -1210 +1213 @@
         $auto_add        = ! empty( $_POST['auto-add-pages'] );
         $nav_menu_option = (array) get_option( 'nav_menu_options' );
+
         if ( ! isset( $nav_menu_option['auto_add'] ) ) {
                 $nav_menu_option['auto_add'] = array();
         }
+
         if ( $auto_add ) {
-                if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+                if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'], true ) ) {
                         $nav_menu_option['auto_add'][] = $nav_menu_selected_id;
                 }
         } else {
-                $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] );
+                $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'], true );
                 if ( false !== $key ) {
                         unset( $nav_menu_option['auto_add'][ $key ] );
                 }
         }
+
         // Remove non-existent/deleted menus.
         $nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );