Changeset 35331 for trunk/src/wp-includes/comment-template.php

Timestamp:

10/21/2015 04:25:31 PM (9 years ago)

Author:

boonebgorges

Message:

Don't force comment pagination.

[34561] instituted the policy of forcing pagination for comments. This strategy
was intended to avert problems when 'page_comments' is set to 0 - as it is by
default - and the number of comments on a given post rises into the hundreds or
thousands. By forcing pagination in all cases, we ensured that WordPress would
not time out by processing unwieldy numbers of comments on a given pageload.

The strategy proves problematic, however, because comment permalinks are
generated using the page of the comment. Forcing pagination for posts that
were not previously paginated would change the URL of all comments that do not
appear on the default comment page.

This changeset reintroduces the 'page_comments' setting and its corresponding
checkbox on Settings > Discussion. A number of tests, which were written after
[34561], are modified to work now that 'page_comments' will, once again, be
disabled by default.

See #8071.

File:

• trunk/src/wp-includes/comment-template.php (modified) (5 diffs)

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

@@ -707 +707 @@
     // No 'cpage' is provided, so we calculate one.
     } else {
-        if ( '' === $args['per_page'] ) {
+        if ( '' === $args['per_page'] && get_option( 'page_comments' ) ) {
             $args['per_page'] = get_option('comments_per_page');
         }
@@ -1269 +1269 @@
     $comment_args = array(
         'orderby' => 'comment_date_gmt',
+        'order' => 'ASC',
         'status'  => 'approve',
         'post_id' => $post->ID,
@@ -1282 +1283 @@
     }
 
-    $per_page = (int) get_query_var( 'comments_per_page' );
-    if ( 0 === $per_page ) {
-        $per_page = (int) get_option( 'comments_per_page' );
-    }
-
-    $comment_args['order']  = 'ASC';
-    $comment_args['number'] = $per_page;
-    $page = (int) get_query_var( 'cpage' );
-
-    if ( $page ) {
-        $comment_args['offset'] = ( $page - 1 ) * $per_page;
-    } elseif ( 'oldest' === get_option( 'default_comments_page' ) ) {
-        $comment_args['offset'] = 0;
-    } else {
-        // If fetching the first page of 'newest', we need a top-level comment count.
-        $top_level_query = new WP_Comment_Query();
-        $top_level_count = $top_level_query->query( array(
-            'count'   => true,
-            'orderby' => false,
-            'post_id' => $post->ID,
-            'parent'  => 0,
-        ) );
-
-        $comment_args['offset'] = ( ceil( $top_level_count / $per_page ) - 1 ) * $per_page;
+    $per_page = 0;
+    if ( get_option( 'page_comments' ) ) {
+        $per_page = (int) get_query_var( 'comments_per_page' );
+        if ( 0 === $per_page ) {
+            $per_page = (int) get_option( 'comments_per_page' );
+        }
+
+        $comment_args['number'] = $per_page;
+        $page = (int) get_query_var( 'cpage' );
+
+        if ( $page ) {
+            $comment_args['offset'] = ( $page - 1 ) * $per_page;
+        } elseif ( 'oldest' === get_option( 'default_comments_page' ) ) {
+            $comment_args['offset'] = 0;
+        } else {
+            // If fetching the first page of 'newest', we need a top-level comment count.
+            $top_level_query = new WP_Comment_Query();
+            $top_level_count = $top_level_query->query( array(
+                'count'   => true,
+                'orderby' => false,
+                'post_id' => $post->ID,
+                'parent'  => 0,
+            ) );
+
+            $comment_args['offset'] = ( ceil( $top_level_count / $per_page ) - 1 ) * $per_page;
+        }
     }
 
@@ -1346 +1349 @@
 
     $overridden_cpage = false;
-    if ( '' == get_query_var('cpage') ) {
+    if ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
         set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
         $overridden_cpage = true;
@@ -1942 +1945 @@
     }
 
-    if ( '' === $r['per_page'] )
+    if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
         $r['per_page'] = get_query_var('comments_per_page');
+    }
 
     if ( empty($r['per_page']) ) {