Ticket #34946: 34946.diff

src/wp-includes/comment-template.php

@@ -736 +736 @@
                 }
         }
 
-        if ( $cpage ) {
+        if ( $cpage && get_option( 'page_comments' ) ) {
                 if ( $wp_rewrite->using_permalinks() ) {
                         if ( $cpage ) {
                                 $link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;

tests/phpunit/tests/comment/getCommentLink.php

@@ -128 +128 @@
 
                 $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 );
+        }
 }