Skip to content

Query: Add orderby support for latest comment date #12344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sukhendu2002 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+106 −0
Open

Query: Add orderby support for latest comment date #12344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/wp-includes/class-wp-query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ public function fill_query_vars( $query_vars ) {
* - 'relevance'
* - 'RAND(x)' (where 'x' is an integer seed value)
* - 'comment_count'
* - 'comment_date'
* - 'meta_value'
* - 'meta_value_num'
* - 'post__in'
Expand Down Expand Up @@ -1707,6 +1708,7 @@ protected function parse_orderby( $orderby ) {
'ID',
'menu_order',
'comment_count',
'comment_date',
'rand',
'post__in',
'post_parent__in',
Expand Down Expand Up @@ -1756,6 +1758,9 @@ protected function parse_orderby( $orderby ) {
case 'comment_count':
$orderby_clause = "{$wpdb->posts}.{$orderby}";
break;
case 'comment_date':
$orderby_clause = 'ISNULL(wp_query_comments_last.comment_date), wp_query_comments_last.comment_date';
break;
case 'rand':
$orderby_clause = 'RAND()';
break;
Expand Down Expand Up @@ -2488,6 +2493,8 @@ public function get_posts() {
$query_vars['order'] = '';
}

$orderby_comment_date = false;

// Order by.
if ( empty( $query_vars['orderby'] ) ) {
/*
Expand All @@ -2512,6 +2519,10 @@ public function get_posts() {
continue;
}

if ( 'comment_date' === $orderby ) {
$orderby_comment_date = true;
}

$orderby_array[] = $parsed . ' ' . $this->parse_order( $order );
}
$orderby = implode( ', ', $orderby_array );
Expand All @@ -2527,6 +2538,10 @@ public function get_posts() {
continue;
}

if ( 'comment_date' === $orderby ) {
$orderby_comment_date = true;
}

$orderby_array[] = $parsed;
}
$orderby = implode( ' ' . $query_vars['order'] . ', ', $orderby_array );
Expand All @@ -2539,6 +2554,16 @@ public function get_posts() {
}
}

if ( $orderby_comment_date ) {
$join .= " LEFT JOIN (
SELECT comment_post_ID, MAX(comment_date) AS comment_date
FROM {$wpdb->comments}
WHERE comment_approved = '1'
AND comment_type != 'note'
GROUP BY comment_post_ID
) AS wp_query_comments_last ON ( {$wpdb->posts}.ID = wp_query_comments_last.comment_post_ID )";
}

// Order search results by relevance only when another "orderby" is not specified in the query.
if ( ! empty( $query_vars['s'] ) ) {
$search_orderby = '';
Expand Down
81 changes: 81 additions & 0 deletions tests/phpunit/tests/query/results.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,87 @@ public function test_query_orderby_post_parent__in_with_order_desc() {
$this->assertSame( $expected_returned_array, wp_list_pluck( $posts, 'post_title' ) );
}

/**
* @ticket 11398
*/
public function test_query_orderby_comment_date() {
$post_ids = self::factory()->post->create_many(
4,
array(
'post_date' => '2020-01-01 00:00:00',
)
);

self::factory()->comment->create(
array(
'comment_post_ID' => $post_ids[0],
'comment_date' => '2020-01-01 00:00:00',
'comment_date_gmt' => '2020-01-04 00:00:00',
)
);
self::factory()->comment->create(
array(
'comment_post_ID' => $post_ids[1],
'comment_date' => '2020-01-02 00:00:00',
'comment_date_gmt' => '2020-01-02 00:00:00',
)
);
self::factory()->comment->create(
array(
'comment_post_ID' => $post_ids[1],
'comment_date' => '2020-01-05 00:00:00',
'comment_date_gmt' => '2020-01-05 00:00:00',
'comment_approved' => '0',
)
);
self::factory()->comment->create(
array(
'comment_post_ID' => $post_ids[2],
'comment_date' => '2019-01-01 00:00:00',
'comment_date_gmt' => '2019-01-01 00:00:00',
)
);
self::factory()->comment->create(
array(
'comment_post_ID' => $post_ids[2],
'comment_date' => '2020-01-03 00:00:00',
'comment_date_gmt' => '2020-01-03 00:00:00',
)
);
self::factory()->comment->create(
array(
'comment_post_ID' => $post_ids[3],
'comment_date' => '2020-01-06 00:00:00',
'comment_date_gmt' => '2020-01-06 00:00:00',
'comment_type' => 'note',
)
);

$query_args = array(
'post__in' => $post_ids,
'orderby' => 'comment_date',
'fields' => 'ids',
'posts_per_page' => -1,
'ignore_sticky_posts' => true,
);

$desc_query = new WP_Query( array_merge( $query_args, array( 'order' => 'DESC' ) ) );
$asc_query = new WP_Query( array_merge( $query_args, array( 'order' => 'ASC' ) ) );
$limited_query = new WP_Query(
array_merge(
$query_args,
array(
'order' => 'DESC',
'posts_per_page' => 2,
)
)
);

$this->assertSame( array( $post_ids[2], $post_ids[1], $post_ids[0], $post_ids[3] ), $desc_query->posts );
$this->assertSame( array( $post_ids[0], $post_ids[1], $post_ids[2], $post_ids[3] ), $asc_query->posts );
$this->assertSame( array( $post_ids[2], $post_ids[1] ), $limited_query->posts );
}

/**
* @ticket 39055
*/
Expand Down
Loading