Changeset 56939

Timestamp:

10/16/2023 12:05:28 AM (3 years ago)

Author:

costdev

Message:

Posts, Post Types: Don't force trailing slash in get_pagenum_link().

Previously, a trailing slash was appended to the link returned from get_pagenum_link(). If the permalink structure didn't contain a trailing slash, this link could fail.

This change removes trailing slashes and only appends one if the site is set for adding trailing slashes.

This adds a new test file for the accompanying tests, tests/phpunit/tests/link/getPagenumLink.php, and moves an existing test for get_pagenum_link() to the same file.

Props davemad-davenet, darkfate, Nazgul, scribu, nacin, obenland, chriscct7, jesin, matthewppelsheimer, audrasjb, petitphp, mukesh27, oglekler, mai21, webtechpooja, tejwanihemant, nicolefurlan, hellofromTonya, costdev.
Fixes #2877.

Location:

trunk

Files:

• src/wp-includes/link-template.php (modified) (2 diffs)
• tests/phpunit/tests/link.php (modified) (1 diff)
• tests/phpunit/tests/link/getPagenumLink.php (added)

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

@@ -2432 +2432 @@
                 preg_match( $qs_regex, $request, $qs_match );
 
+                $parts   = array();
+                $parts[] = untrailingslashit( get_bloginfo( 'url' ) );
+
                 if ( ! empty( $qs_match[0] ) ) {
                         $query_string = $qs_match[0];
@@ -2443 +2446 @@
                 $request = ltrim( $request, '/' );
 
-                $base = trailingslashit( get_bloginfo( 'url' ) );
-
                 if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' !== $request ) ) {
-                        $base .= $wp_rewrite->index . '/';
-                }
+                        $parts[] = $wp_rewrite->index;
+                }
+
+                $parts[] = untrailingslashit( $request );
 
                 if ( $pagenum > 1 ) {
-                        $request = ( ( ! empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . '/' . $pagenum, 'paged' );
-                }
-
-                $result = $base . $request . $query_string;
+                        $parts[] = $wp_rewrite->pagination_base;
+                        $parts[] = $pagenum;
+                }
+
+                $result = user_trailingslashit( implode( '/', array_filter( $parts ) ), 'paged' );
+                if ( ! empty( $query_string ) ) {
+                        $result .= $query_string;
+                }
         }
 

trunk/tests/phpunit/tests/link.php

@@ -4 +4 @@
  */
 class Tests_Link extends WP_UnitTestCase {
-
-        public function get_pagenum_link_cb( $url ) {
-                return $url . '/WooHoo';
-        }
-
-        /**
-         * @ticket 8847
-         */
-        public function test_get_pagenum_link_case_insensitivity() {
-                $old_req_uri = $_SERVER['REQUEST_URI'];
-
-                $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-
-                add_filter( 'home_url', array( $this, 'get_pagenum_link_cb' ) );
-                $_SERVER['REQUEST_URI'] = '/woohoo';
-                $paged                  = get_pagenum_link( 2 );
-
-                remove_filter( 'home_url', array( $this, 'get_pagenum_link_cb' ) );
-                $this->assertSame( $paged, home_url( '/WooHoo/page/2/' ) );
-
-                $_SERVER['REQUEST_URI'] = $old_req_uri;
-        }
 
         public function test_wp_get_shortlink() {