Changeset 9190

Timestamp:

10/16/2019 07:17:46 AM (7 years ago)

Author:

dd32

Message:

Plugin Directory: Use our own canonical url rather than trusting core to produce the correct link.

See #4325.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -165 +165 @@
          */
         public static function archive_link_rel_prev_next() {
-                global $paged, $wp_query;
+                global $paged, $wp_query, $wp_rewrite;
                 if ( ! is_archive() && ! is_search() ) {
                         return;
@@ -178 +178 @@
                 $prevpage = intval( $paged ) - 1;
 
+                // re-implement get_pagenum_link() using our canonical url.
+                $current_url = Template::get_current_url();
+                if ( ! $current_url ) {
+                        return;
+                }
+
+                $current_url = remove_query_arg( 'paged', $current_url );
+                $current_url = preg_replace( "|{$wp_rewrite->pagination_base}/\d+/?$|", '', $current_url );
+
+                // Just assume pretty permalinks everywhere.
+                $next_url = $current_url . "{$wp_rewrite->pagination_base}/{$nextpage}/";
+                $prev_url = $current_url . ( $prevpage > 1 ? "{$wp_rewrite->pagination_base}/{$prevpage}/" : '' );
+
                 if ( $prevpage >= 1 ) {
                         printf(
                                 '<link rel="prev" href="%s">' . "\n",
-                                esc_url( get_pagenum_link( $prevpage ) )
+                                esc_url( $prev_url )
                         );
                 }
@@ -188 +201 @@
                         printf(
                                 '<link rel="next" href="%s">' . "\n",
-                                esc_url( get_pagenum_link( $nextpage ) )
+                                esc_url( $next_url )
                         );
                 }