Changeset 48413

Timestamp:

07/10/2020 12:29:48 AM (4 years ago)

Author:

whyisjake

Message:

Formatting: Ensure that wp_filter_object_list() will return an array when being passed an object with magic methods.

Fixes #50095.

Props johnjamesjacoby.

File:

• trunk/src/wp-includes/class-wp-list-util.php (modified) (1 diff)

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

@@ -103 +103 @@
 
         foreach ( $this->output as $key => $obj ) {
-            $to_match = (array) $obj;
-
             $matched = 0;
+
             foreach ( $args as $m_key => $m_value ) {
-                if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] ) {
-                    $matched++;
+
+                if ( is_array( $obj ) ) {
+
+                    // Treat object as an array
+                    if ( array_key_exists( $m_key, $obj ) && ( $m_value == $obj[ $m_key ] ) ) {
+                        $matched++;
+                    }
+
+                } elseif ( is_object( $obj ) ) {
+
+                    // Treat object as an object
+                    if ( isset( $obj->{$m_key} ) && ( $m_value == $obj->{$m_key} ) ) {
+                        $matched++;
+                    }
                 }
             }