Changeset 34669

Timestamp:

09/28/2015 07:29:22 PM (9 years ago)

Author:

boonebgorges

Message:

Fix comment_order for single page comment threads.

The old comment pagination logic had a separate block for comment threads that
appeared on a single page. After the refactoring in [34561], all comment
pagination logic is unified.

This change ensures that 'comment_order' is respected in all scenarios.

Fixes #8071.

Location:

trunk

Files:

• src/wp-includes/comment-template.php (modified) (2 diffs)
• tests/phpunit/tests/comment/commentsTemplate.php (added)

trunk/src/wp-includes/comment-template.php

@@ -1234 +1234 @@
     }
 
-    $flip_comment_order = $trim_comments_on_page = false;
-    if ( $post->comment_count > $per_page ) {
-        $comment_args['number'] = $per_page;
-
-        /*
-         * For legacy reasons, higher page numbers always mean more recent comments, regardless of sort order.
-         * Since we don't have full pagination info until after the query, we use some tricks to get the
-         * right comments for the current page.
-         *
-         * Abandon all hope, ye who enter here!
-         */
-        $page = (int) get_query_var( 'cpage' );
-        if ( 'newest' === get_option( 'default_comments_page' ) ) {
-            if ( $page ) {
-                $comment_args['order'] = 'ASC';
-
-                /*
-                 * We don't have enough data (namely, the total number of comments) to calculate an
-                 * exact offset. We'll fetch too many comments, and trim them as needed
-                 * after the query.
-                 */
-                $offset = ( $page - 2 ) * $per_page;
-                if ( 0 > $offset ) {
-                    // `WP_Comment_Query` doesn't support negative offsets.
-                    $comment_args['offset'] = 0;
-                } else {
-                    $comment_args['offset'] = $offset;
-                }
-
-                // Fetch double the number of comments we need.
-                $comment_args['number'] += $per_page;
-                $trim_comments_on_page = true;
+    /*
+     * For legacy reasons, higher page numbers always mean more recent comments, regardless of sort order.
+     * Since we don't have full pagination info until after the query, we use some tricks to get the
+     * right comments for the current page.
+     *
+     * Abandon all hope, ye who enter here!
+     */
+    $flip_comment_order = $trim_comments_on_page= false;
+    $comment_args['number'] = $per_page;
+    $page = (int) get_query_var( 'cpage' );
+    if ( 'newest' === get_option( 'default_comments_page' ) ) {
+        if ( $page ) {
+            $comment_args['order'] = 'ASC';
+
+            /*
+             * We don't have enough data (namely, the total number of comments) to calculate an
+             * exact offset. We'll fetch too many comments, and trim them as needed
+             * after the query.
+             */
+            $offset = ( $page - 2 ) * $per_page;
+            if ( 0 > $offset ) {
+                // `WP_Comment_Query` doesn't support negative offsets.
+                $comment_args['offset'] = 0;
             } else {
-                $comment_args['order'] = 'DESC';
-                $comment_args['offset'] = 0;
-                $flip_comment_order = true;
+                $comment_args['offset'] = $offset;
             }
+
+
+
+
         } else {
-            $comment_args['order'] = 'ASC';
-            if ( $page ) {
-                $comment_args['offset'] = ( $page - 1 ) * $per_page;
-            } else {
-                $comment_args['offset'] = 0;
-            }
+            $comment_args['order'] = 'DESC';
+            $comment_args['offset'] = 0;
+            $flip_comment_order = true;
+        }
+    } else {
+        $comment_args['order'] = 'ASC';
+        if ( $page ) {
+            $comment_args['offset'] = ( $page - 1 ) * $per_page;
+        } else {
+            $comment_args['offset'] = 0;
         }
     }
@@ -1284 +1281 @@
     $_comments = $comment_query->comments;
 
-    // Delightful pagination quirk #1: first page of results sometimes needs reordering.
+    // Delightful pagination quirk #1: ng.
     if ( $flip_comment_order ) {
         $_comments = array_reverse( $_comments );