Changeset 61773

Timestamp:

02/28/2026 12:41:31 AM (6 weeks ago)

Author:

westonruter

Message:

REST API: Guard against passing null as $prepared_args to WP_REST_Posts_Controller::prepare_items_query().

The variable may get set to null by a filter or subclass.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/7625

Follow-up to r38832.

Props apermo, dmsnell, westonruter.
Fixes #62287.

Location:

trunk/src/wp-includes/rest-api/endpoints

Files:

• class-wp-rest-posts-controller.php (modified) (2 diffs)
• class-wp-rest-revisions-controller.php (modified) (2 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -442 +442 @@
          * @param WP_REST_Request $request The REST API request.
          */
-        $args       = apply_filters( "rest_{$this->post_type}_query", $args, $request );
+        $args = apply_filters( "rest_{$this->post_type}_query", $args, $request );
+        if ( ! is_array( $args ) ) {
+            $args = array();
+        }
         $query_args = $this->prepare_items_query( $args, $request );
 
@@ -1212 +1215 @@
     protected function prepare_items_query( $prepared_args = array(), $request = null ) {
         $query_args = array();
+        if ( ! is_array( $prepared_args ) ) {
+            $prepared_args = array();
+        }
 
         foreach ( $prepared_args as $key => $value ) {

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php

@@ -299 +299 @@
 
             /** This filter is documented in wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php */
-            $args       = apply_filters( 'rest_revision_query', $args, $request );
+            $args = apply_filters( 'rest_revision_query', $args, $request );
+            if ( ! is_array( $args ) ) {
+                $args = array();
+            }
             $query_args = $this->prepare_items_query( $args, $request );
 
@@ -550 +553 @@
     protected function prepare_items_query( $prepared_args = array(), $request = null ) {
         $query_args = array();
+        if ( ! is_array( $prepared_args ) ) {
+            $prepared_args = array();
+        }
 
         foreach ( $prepared_args as $key => $value ) {