Changeset 45639 for trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

Timestamp:

07/15/2019 06:24:08 AM (6 years ago)

Author:

pento

Message:

Code Modernisation: Fix known instances of array access on data types that can't be accessed as arrays.

PHP 7.4 addes a warning when trying access a null/bool/int/float/resource (everything but array, string and object) as if it were an array.

This change fixes all of these warnings visible in unit tests.

Props jrf.
See #47704.

File:

• trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php (modified) (2 diffs)

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

@@ -478 +478 @@
     public function filter_wp_get_nav_menu_items( $items, $menu, $args ) {
         $this_item                = $this->value();
-        $current_nav_menu_term_id = $this_item['nav_menu_term_id'];
-        unset( $this_item['nav_menu_term_id'] );
+        $current_nav_menu_term_id = null;
+        if ( isset( $this_item['nav_menu_term_id'] ) ) {
+            $current_nav_menu_term_id = $this_item['nav_menu_term_id'];
+            unset( $this_item['nav_menu_term_id'] );
+        }
 
         $should_filter = (
@@ -494 +497 @@
             false === $this_item
             ||
-            true === $this_item['_invalid']
+            ( isset( $this_item['_invalid'] ) && true === $this_item['_invalid'] )
             ||
             (