From 04bb8a07d7cbed176931580780bec889c46a1dae Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Thu, 24 Sep 2015 14:30:00 +0000
Subject: [PATCH] Canonical/Rewrite: After [34492], fix `rel="canonical"` URLs
 for paginated posts.

Props wonderboymusic, joostdevalk.
See #11694.


git-svn-id: https://develop.svn.wordpress.org/trunk@34496 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/link-template.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/link-template.php b/src/wp-includes/link-template.php
index 9d9fc00ad7..d6815ad9a3 100644
--- a/src/wp-includes/link-template.php
+++ b/src/wp-includes/link-template.php
@@ -3455,8 +3455,14 @@ function rel_canonical() {
 
 	$url = get_permalink( $id );
 
-	if ( $page = get_query_var('cpage') ) {
-		$url = get_comments_pagenum_link( $page );
+	$page = get_query_var( 'page' );
+	if ( $page ) {
+		$url = trailingslashit( $url ) . user_trailingslashit( $page, 'single_paged' );
+	}
+
+	$cpage = get_query_var( 'cpage' );
+	if ( $cpage ) {
+		$url = get_comments_pagenum_link( $cpage );
 	}
 	echo '<link rel="canonical" href="' . esc_url( $url ) . "\" />\n";
 }