Changeset 57732 for trunk/src/wp-includes/class-wp-list-util.php

Timestamp:

02/27/2024 10:36:09 PM (13 months ago)

Author:

hellofromTonya

Message:

General: Revert r57698 for WP_List_Util::pluck().

r57698 caused a regression for arrays of objects which have magic methods and dynamic properties. A fix is identified.

However, a deeper dive discovered additional scenarios which will require a different fix.

Reverting gives more time for resolving these scenarios and more soak time to discover if there are others.

Props dd32, jamescollins, swissspidy.
See #59774.

File:

• trunk/src/wp-includes/class-wp-list-util.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-list-util.php

@@ -166 +166 @@
             foreach ( $this->output as $key => $value ) {
                 if ( is_object( $value ) ) {
-                    if ( property_exists( $value, $field ) ) {
-                        $newlist[ $key ] = $value->$field;
-                    }
+                    $newlist[ $key ] = $value->$field;
                 } elseif ( is_array( $value ) ) {
-                    if ( array_key_exists( $field, $value ) ) {
-                        $newlist[ $key ] = $value[ $field ];
-                    }
+                    $newlist[ $key ] = $value[ $field ];
                 } else {
                     _doing_it_wrong(
@@ -193 +189 @@
         foreach ( $this->output as $value ) {
             if ( is_object( $value ) ) {
-                if ( property_exists( $value, $field ) ) {
-                    if ( property_exists( $value, $index_key ) ) {
-                        $newlist[ $value->$index_key ] = $value->$field;
-                    } else {
-                        $newlist[] = $value->$field;
-                    }
+                if ( isset( $value->$index_key ) ) {
+                    $newlist[ $value->$index_key ] = $value->$field;
+                } else {
+                    $newlist[] = $value->$field;
                 }
             } elseif ( is_array( $value ) ) {
-                if ( array_key_exists( $field, $value ) ) {
-                    if ( array_key_exists( $index_key, $value ) ) {
-                        $newlist[ $value[ $index_key ] ] = $value[ $field ];
-                    } else {
-                        $newlist[] = $value[ $field ];
-                    }
+                if ( isset( $value[ $index_key ] ) ) {
+                    $newlist[ $value[ $index_key ] ] = $value[ $field ];
+                } else {
+                    $newlist[] = $value[ $field ];
                 }
             } else {