diff --git a/wp-includes/class-wp-list-util.php b/wp-includes/class-wp-list-util.php index 6560355291..a2b1f92969 100644 --- a/wp-includes/class-wp-list-util.php +++ b/wp-includes/class-wp-list-util.php @@ -165,9 +165,13 @@ class WP_List_Util { */ foreach ( $this->output as $key => $value ) { if ( is_object( $value ) ) { - $newlist[ $key ] = $value->$field; + if ( property_exists( $value, $field ) ) { + $newlist[ $key ] = $value->$field; + } } elseif ( is_array( $value ) ) { - $newlist[ $key ] = $value[ $field ]; + if ( array_key_exists( $field, $value ) ) { + $newlist[ $key ] = $value[ $field ]; + } } else { _doing_it_wrong( __METHOD__, @@ -188,16 +192,20 @@ class WP_List_Util { */ foreach ( $this->output as $value ) { if ( is_object( $value ) ) { - if ( isset( $value->$index_key ) ) { - $newlist[ $value->$index_key ] = $value->$field; - } else { - $newlist[] = $value->$field; + if ( property_exists( $value, $field ) ) { + if ( property_exists( $value, $index_key ) ) { + $newlist[ $value->$index_key ] = $value->$field; + } else { + $newlist[] = $value->$field; + } } } elseif ( is_array( $value ) ) { - if ( isset( $value[ $index_key ] ) ) { - $newlist[ $value[ $index_key ] ] = $value[ $field ]; - } else { - $newlist[] = $value[ $field ]; + if ( array_key_exists( $field, $value ) ) { + if ( array_key_exists( $index_key, $value ) ) { + $newlist[ $value[ $index_key ] ] = $value[ $field ]; + } else { + $newlist[] = $value[ $field ]; + } } } else { _doing_it_wrong( diff --git a/wp-includes/version.php b/wp-includes/version.php index 4d8bf9bf23..421feed780 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.5-beta2-57697'; +$wp_version = '6.5-beta2-57698'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.