Ticket #11694: pagination-rel-canonical.3.patch

wp-includes/post-template.php

@@ -719 +719 @@
  * @return string Link.
  */
 function _wp_link_page( $i ) {
-        global $wp_rewrite;
-        $post = get_post();
-
-        if ( 1 == $i ) {
-                $url = get_permalink();
-        } else {
-                if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-                        $url = add_query_arg( 'page', $i, get_permalink() );
-                elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-                        $url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
-                else
-                        $url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
-        }
-
+        $url = get_paginated_post_url( get_the_ID(), $i );
         return '<a href="' . esc_url( $url ) . '">';
 }
 

wp-includes/link-template.php

@@ -73 +73 @@
  *
  * @since 1.0.0
  *
- * @param int $id Optional. Post ID.
+ * @param int|object $id Optional. Post ID or post object.
  * @param bool $leavename Optional, defaults to false. Whether to keep post name or page name.
  * @return string
  */
@@ -1835 +1835 @@
 }
 
 /**
+ * Return URL for post at the required page
+ *
+ * @param int $post_id Post to create link for
+ * @param int $i Page number to create link for
+ *
+ * @return string
+ */
+function get_paginated_post_url( $post_id, $i ) {
+        global $wp_rewrite;
+        $post = get_post( $post_id );
+
+        if ( 1 == $i ) {
+                $url = get_permalink( $post );
+        } else {
+                if ( '' == get_option( 'permalink_structure' ) || in_array( $post->post_status, array( 'draft', 'pending' ) ) )
+                        $url = add_query_arg( 'page', $i, get_permalink( $post ) );
+                elseif ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post->ID )
+                        $url = trailingslashit( get_permalink( $post ) ) . user_trailingslashit( "$wp_rewrite->pagination_base/" . $i, 'single_paged' );
+                else
+                        $url = trailingslashit( get_permalink( $post ) ) . user_trailingslashit( $i, 'single_paged' );
+        }
+        return $url;
+}
+
+/**
  * Retrieve the Press This bookmarklet link.
  *
  * Use this in 'a' element 'href' attribute.
@@ -2320 +2345 @@
 
         $link = get_permalink( $id );
 
-        if ( $page = get_query_var('cpage') )
-                $link = get_comments_pagenum_link( $page );
+        if ( $page = get_query_var( 'page' ) )
+                $link = get_paginated_post_url( $id, $page );
+
+        if ( $cpage = get_query_var('cpage') )
+                $link = get_comments_pagenum_link( $cpage );
 
         echo "<link rel='canonical' href='$link' />\n";
 }