sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore the 'comment_order' setting when determining comment pagination.

Browse Source 
[38740] incorrectly introduced logic that changed a comment's page when
'comment_order' was set to 'desc'. This is in violation of the design
of the comment pagination system: a comment's page is designed not to
change when 'comment_order' or 'default_comment_page' are changed.
See #31101.

Props rachelbaker.
Fixes #39280.

git-svn-id: https://develop.svn.wordpress.org/trunk@39663 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
boonebgorges 2017-01-02 19:58:09 +00:00
parent 3418d831a5
commit 80905ab4b1
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/comment.php
View File

@ -1003,12 +1003,6 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent ) if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
return get_page_of_comment( $comment->comment_parent, $args ); return get_page_of_comment( $comment->comment_parent, $args );
if ( 'desc' === get_option( 'comment_order' ) ) {
$compare = 'after';
} else {
$compare = 'before';
}
$comment_args = array( $comment_args = array(
'type' => $args['type'], 'type' => $args['type'],
'post_id' => $comment->comment_post_ID, 'post_id' => $comment->comment_post_ID,
@ -1019,7 +1013,7 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
'date_query' => array( 'date_query' => array(
array( array(
'column' => "$wpdb->comments.comment_date_gmt", 'column' => "$wpdb->comments.comment_date_gmt",
$compare => $comment->comment_date_gmt, 'before' => $comment->comment_date_gmt,
) )
), ),
); );

26
tests/phpunit/tests/comment/getPageOfComment.php
View File

@ -241,18 +241,40 @@ class Tests_Comment_GetPageOfComment extends WP_UnitTestCase {
/** /**
* @ticket 31101 * @ticket 31101
* @ticket 39280
*/ */
public function test_should_respect_comment_order_newest() { public function test_should_ignore_comment_order() {
$now = time(); $now = time();
$p = self::factory()->post->create(); $p = self::factory()->post->create();
$c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) ); $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
$c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) ); $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
$c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) ); $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
$c4 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 40 ) ) );
update_option( 'comment_order', 'desc' ); update_option( 'comment_order', 'desc' );
update_option( 'page_comments', 1 ); update_option( 'page_comments', 1 );
update_option( 'comments_per_page', 2 ); update_option( 'comments_per_page', 1 );
$this->assertEquals( 2, get_page_of_comment( $c3 ) );
}
/**
* @ticket 31101
* @ticket 39280
*/
public function test_should_ignore_default_comment_page() {
$now = time();
$p = self::factory()->post->create();
$c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
$c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
$c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
$c4 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 40 ) ) );
update_option( 'default_comment_page', 'newest' );
update_option( 'page_comments', 1 );
update_option( 'comments_per_page', 1 );
$this->assertEquals( 2, get_page_of_comment( $c3 ) ); $this->assertEquals( 2, get_page_of_comment( $c3 ) );
} }