Changeset 35933

Timestamp:

12/14/2015 07:45:45 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.

Fixes #34946.

Location:

trunk

Files:

• src/wp-includes/comment-template.php (modified) (1 diff)
• tests/phpunit/tests/comment/getCommentLink.php (modified) (1 diff)

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

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

trunk/tests/phpunit/tests/comment/getCommentLink.php

@@ -129 +129 @@
         $this->assertContains( 'cpage=3', $found );
     }
+
+    /**
+     * @ticket 34946
+     */
+    public function test_should_not_contain_comment_page_1_when_pagination_is_disabled() {
+        $this->set_permalink_structure( '/%postname%/' );
+        update_option( 'page_comments', 0 );
+
+        $found = get_comment_link( self::$comments[1] );
+
+        $this->assertNotContains( 'comment-page-1', $found );
+    }
 }