HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.

Built from https://develop.svn.wordpress.org/trunk@61773


git-svn-id: http://core.svn.wordpress.org/trunk@61079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter
2026-02-28 00:42:43 +00:00
parent f178cca743
commit 4bbdf78c53
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
View File

@@ -441,7 +441,10 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
* @param array $args Array of arguments for WP_Query.
* @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 );
$posts_query = new WP_Query();
@@ -1211,6 +1214,9 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
*/
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 ) {
/**

8
wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
View File

@@ -298,7 +298,10 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
}
/** 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 );
$revisions_query = new WP_Query();
@@ -549,6 +552,9 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
*/
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 ) {
/** This filter is documented in wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php */

2
wp-includes/version.php
View File

@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '7.0-beta2-61772';
$wp_version = '7.0-beta2-61773';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.