Changeset 62036 for trunk/src/wp-includes/general-template.php

Timestamp:

03/17/2026 01:33:03 AM (6 months ago)

Author:

peterwilsoncc

Message:

Permalinks: Follow rewrite rules for trailing slashes in paginate_links().

Modifies the default settings of paginate_links() to only include trailing slashes, eg example.org/page/2/, when the permalink settings include a trailing slash. When the permalink settings do not include a slash, neither do the generated links, eg example.org/page/2.

This prevents the generated links from hitting a URL that subsequently redirects when the permalink structure does not include a trailing slash.

Props adamsilverstein, ankitkumarshah, audrasjb, hmbashar, huzaifaalmesbah, joedolson, juanmaguitar, krupajnanda, mai21, ozgursar, peterwilsoncc, rahulsprajapati, sirlouen, welcher, westonruter.
Fixes #61393.

File:

• trunk/src/wp-includes/general-template.php (modified) (1 diff)

trunk/src/wp-includes/general-template.php

@@ -4670 +4670 @@
         $current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
 
-        // Append the format placeholder to the base URL.
-        $pagenum_link = trailingslashit( $url_parts[0] ) . '%_%';
+        /*
+         * Ensures sites not using trailing slashes get links in the form
+         * `/page/2` rather than `/page/2/`. On these sites, linking to the
+         * URL with a trailing slash will result in a 301 redirect from the
+         * incorrect URL to the correctly formatted one. This presents an
+         * unnecessary performance hit.
+         */
+        if ( $wp_rewrite->using_permalinks() && ! $wp_rewrite->use_trailing_slashes ) {
+                $pagenum_link = untrailingslashit( $url_parts[0] );
+        } else {
+                $pagenum_link = trailingslashit( $url_parts[0] );
+        }
+        $pagenum_link .= '%_%';
 
         // URL base depends on permalink settings.
         $format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
         $format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+        if ( $wp_rewrite->using_permalinks() && ! $wp_rewrite->use_trailing_slashes ) {
+                $format = '/' . ltrim( $format, '/' );
+        }
 
         $defaults = array(