mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-12 16:15:07 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Query: Restore late compact() call for the posts_clauses_request filter.

Browse Source 
This addresses a backward compatibility break where `posts_join_request` and other filters were applied, but their results were subsequently discarded and earlier values were used instead.

Follow-up to [52974], [53175].

Props 5um17, johnbillion, peterwilsoncc, hellofromTonya, SergeyBiryukov.
Merges [53370] and [53375] to the 6.0 branch.
Fixes #55699.

git-svn-id: https://develop.svn.wordpress.org/branches/6.0@53379 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2022-05-10 16:07:10 +00:00
parent 60408de989
commit b49e8885e8
2 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/class-wp-query.php
View File

@ -2754,7 +2754,7 @@ class WP_Query {
}
}
$clauses = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
/*
* Apply post-paging filters on where and join. Only plugins that
@ -2856,7 +2856,7 @@ class WP_Query {
* }
* @param WP_Query $query The WP_Query instance (passed by reference).
*/
$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $clauses ), &$this ) );
$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
$where = isset( $clauses['where'] ) ? $clauses['where'] : '';
$groupby = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
@ -2990,7 +2990,7 @@ class WP_Query {
* }
* @param WP_Query $query The WP_Query instance (passed by reference).
*/
$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( $clauses, &$this ) );
$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
$where = isset( $clauses['where'] ) ? $clauses['where'] : '';
$groupby = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';

50
tests/phpunit/tests/query.php
View File

@ -719,4 +719,54 @@ class Tests_Query extends WP_UnitTestCase {
$this->assertInstanceOf( 'WP_User', get_queried_object() );
$this->assertSame( get_queried_object_id(), $user_id );
}
/**
* Tests that the `posts_clauses` filter receives an array of clauses
* with the other `posts_*` filters applied, e.g. `posts_join_paged`.
*
* @ticket 55699
* @covers WP_Query::get_posts
*/
public function test_posts_clauses_filter_should_receive_filtered_clauses() {
add_filter(
'posts_join_paged',
static function() {
return '/* posts_join_paged */';
}
);
$filter = new MockAction();
add_filter( 'posts_clauses', array( $filter, 'filter' ), 10, 2 );
$this->go_to( '/' );
$filter_args = $filter->get_args();
$posts_clauses = $filter_args[0][0];
$this->assertArrayHasKey( 'join', $posts_clauses );
$this->assertSame( '/* posts_join_paged */', $posts_clauses['join'] );
}
/**
* Tests that the `posts_clauses_request` filter receives an array of clauses
* with the other `posts_*_request` filters applied, e.g. `posts_join_request`.
*
* @ticket 55699
* @covers WP_Query::get_posts
*/
public function test_posts_clauses_request_filter_should_receive_filtered_clauses() {
add_filter(
'posts_join_request',
static function() {
return '/* posts_join_request */';
}
);
$filter = new MockAction();
add_filter( 'posts_clauses_request', array( $filter, 'filter' ), 10, 2 );
$this->go_to( '/' );
$filter_args = $filter->get_args();
$posts_clauses_request = $filter_args[0][0];
$this->assertArrayHasKey( 'join', $posts_clauses_request );
$this->assertSame( '/* posts_join_request */', $posts_clauses_request['join'] );
}
}