From 3bc0e35684cdd6d848c977c517bab9b78188438f Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Mon, 14 Dec 2015 19:46:46 +0000 Subject: [PATCH] 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. Built from https://develop.svn.wordpress.org/trunk@35933 git-svn-id: http://core.svn.wordpress.org/trunk@35897 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/comment-template.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 854cbe73b3..84a60dbc4a 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -736,7 +736,7 @@ function get_comment_link( $comment = null, $args = array() ) { } } - if ( $cpage ) { + if ( $cpage && get_option( 'page_comments' ) ) { if ( $wp_rewrite->using_permalinks() ) { if ( $cpage ) { $link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage; diff --git a/wp-includes/version.php b/wp-includes/version.php index 95626d63cb..72a00e140e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-35931'; +$wp_version = '4.5-alpha-35933'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.