From 1879fa641331cf3415e4bfbfbcad385201a83faf Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Sun, 27 Dec 2015 02:12:23 +0000
Subject: [PATCH] Canonical: Output correct canonical links for paged posts
 when not using pretty permalinks.

Merges [36096] to the 4.4 branch.
Props peterwilsoncc.
Fixes #34890.

Built from https://develop.svn.wordpress.org/branches/4.4@36103


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 8 ++++++--
 wp-includes/version.php       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 5aabffa61d..932d742da9 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -3502,8 +3502,12 @@ function rel_canonical() {
 	$url = get_permalink( $id );
 
 	$page = get_query_var( 'page' );
-	if ( $page ) {
-		$url = trailingslashit( $url ) . user_trailingslashit( $page, 'single_paged' );
+	if ( $page >= 2 ) {
+		if ( '' == get_option( 'permalink_structure' ) ) {
+			$url = add_query_arg( 'page', $page, $url );
+		} else {
+			$url = trailingslashit( $url ) . user_trailingslashit( $page, 'single_paged' );
+		}
 	}
 
 	$cpage = get_query_var( 'cpage' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3acc6bd388..82b18121ab 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4.1-alpha-36101';
+$wp_version = '4.4.1-alpha-36103';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.