From 6ab3caeb7154d72d3b6940d3f1be8ed7a2a1e5a7 Mon Sep 17 00:00:00 2001
From: hellofromTonya <hellofromTonya@git.wordpress.org>
Date: Tue, 27 Feb 2024 22:38:15 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@57732


git-svn-id: http://core.svn.wordpress.org/trunk@57233 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-list-util.php | 28 ++++++++++------------------
 wp-includes/version.php            |  2 +-
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/wp-includes/class-wp-list-util.php b/wp-includes/class-wp-list-util.php
index a2b1f92969..6560355291 100644
--- a/wp-includes/class-wp-list-util.php
+++ b/wp-includes/class-wp-list-util.php
@@ -165,13 +165,9 @@ class WP_List_Util {
 			 */
 			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(
 						__METHOD__,
@@ -192,20 +188,16 @@ class WP_List_Util {
 		 */
 		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 {
 				_doing_it_wrong(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 44892913b1..9e7ee998a2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-beta3-57731';
+$wp_version = '6.5-beta3-57732';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.