Changeset 36103 for branches/4.4

Timestamp:

12/27/2015 02:11:56 AM (11 years ago)

Author:

dd32

Message:

Canonical: Output correct canonical links for paged posts when not using pretty permalinks.

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

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/link-template.php (modified) (1 diff)

branches/4.4/src/wp-includes/link-template.php

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