Changeset 35934 for branches/4.4/src/wp-includes/comment-template.php

Timestamp:

12/14/2015 07:56:14 PM (9 years ago)

Author:

boonebgorges

Message:

Omit cpage query var in comment link if comment pagination is disabled.

WP 4.4 changed the way comment pagination is calculated. See #8071. In the
context of get_comment_link(), these changes introduced a regression that
causes cpage (or its pretty-permalink correlate comment-page-x) to appear
in comment links when comment pagination is disabled. The current changeset
fixes the regression.

Merges [35933] to the 4.4 branch.

Fixes #34946.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/comment-template.php (modified) (1 diff)

branches/4.4/src/wp-includes/comment-template.php

@@ -737 +737 @@
     }
 
-    if ( $cpage ) {
+    if ( $cpage && get_option( 'page_comments' ) ) {
         if ( $wp_rewrite->using_permalinks() ) {
             if ( $cpage ) {