Changeset 37750 for trunk/src/wp-includes/compat.php

Timestamp:

06/19/2016 12:50:15 PM (8 years ago)

Author:

swissspidy

Message:

Menus: Fix _wp_expand_nav_menu_post_data() for PHP 5.2.

[37748] introduced _wp_expand_nav_menu_post_data() together with an array_replace_recursive() compatibility function for PHP 5.2.
Even though that compat function is tried and tested in other projects like BuddyPress, we need to add additional isset() checks in order to avoid 'Undefined index' notices in our case.

See #36590.

File:

• trunk/src/wp-includes/compat.php (modified) (1 diff)

trunk/src/wp-includes/compat.php

@@ -472 +472 @@
 
                 foreach ( array_keys( $head ) as $key ) {
-                    if ( isset( $key, $bref ) && is_array( $bref[ $key ] ) && is_array( $head[ $key ] ) ) {
+                    if ( isset( $key, $bref ) &&
+                         isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
+                         isset( $head[ $key ] ) && is_array( $head[ $key ] )
+                    ) {
                         $bref_stack[] = &$bref[ $key ];
                         $head_stack[] = $head[ $key ];