Ticket #43025: 43025.2.diff

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

@@ -125 +125 @@
         }
 
         /**
+         * Determined whether the input is an iterable object.
+         *
+         * @since 4.9.4
+         *
+         * @param mixed $input The potential iterable object we want to evaluate
+         *
+         * @return iterable The original input if it was an iterable object. Or if not, an empty array
+         */
+        public static function maybe_list( $input ) {
+                if ( ! is_array( $input ) && ! $input instanceof Traversable ) {
+                        return array();
+                }
+                return $input;
+        }
+
+        /**
          * Plucks a certain field out of each object in the list.
          *
          * This has the same functionality and prototype of

wp-includes/functions.php

@@ -3746 +3746 @@
  * @since 3.1.0
  * @since 4.7.0 Uses WP_List_Util class.
  *
- * @param array  $list     An array of objects to filter.
- * @param array  $args     Optional. An array of key => value arguments to match
- *                         against each object. Default empty array.
- * @param string $operator Optional. The logical operation to perform. 'AND' means
- *                         all elements from the array must match. 'OR' means only
- *                         one element needs to match. 'NOT' means no elements may
- *                         match. Default 'AND'.
+ * @param iterable $list     An array of objects to filter.
+ * @param array    $args     Optional. An array of key => value arguments to match
+ *                           against each object. Default empty array.
+ * @param string   $operator Optional. The logical operation to perform. 'AND' means
+ *                           all elements from the array must match. 'OR' means only
+ *                           one element needs to match. 'NOT' means no elements may
+ *                           match. Default 'AND'.
  * @return array Array of found values.
  */
 function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-        if ( ! is_array( $list ) ) {
-                return array();
-        }
+
+        $list = WP_List_Util::maybe_list($list);
 
         $util = new WP_List_Util( $list );
         return $util->filter( $args, $operator );