From 6124fbb02ccac94673048fc05625ed83ad0d4ee0 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Mon, 2 Jan 2017 20:08:23 +0000
Subject: [PATCH] Ignore the 'comment_order' setting when determining comment
 pagination.

[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.

Merges [39663] to the 4.7 branch.

Props rachelbaker.
Fixes #39280.

Built from https://develop.svn.wordpress.org/branches/4.7@39664


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment.php | 8 +-------
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index ae759c04f5..ba60070fd7 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -1003,12 +1003,6 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
 			return get_page_of_comment( $comment->comment_parent, $args );
 
-		if ( 'desc' === get_option( 'comment_order' ) ) {
-			$compare = 'after';
-		} else {
-			$compare = 'before';
-		}
-
 		$comment_args = array(
 			'type'       => $args['type'],
 			'post_id'    => $comment->comment_post_ID,
@@ -1019,7 +1013,7 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 			'date_query' => array(
 				array(
 					'column' => "$wpdb->comments.comment_date_gmt",
-					$compare => $comment->comment_date_gmt,
+					'before' => $comment->comment_date_gmt,
 				)
 			),
 		);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e4290a6584..a24dd9839b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7.1-alpha-39661';
+$wp_version = '4.7.1-alpha-39664';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.