Changeset 59966

Timestamp:

03/11/2025 11:10:00 AM (6 weeks ago)

Author:

audrasjb

Message:

Permalinks: Ensure pagination links are consistent with permalink structure.

This changeset ensures that pagination links stay consistent with the chosen permalink structure. When the permalink structure uses a trailing slash, pagination permalinks contain one as well, but when the permalink structure doesn't use trailing slash, then pagination links should not use a trailing slash.

This makes use of user_trailingslashit() with a paged value for the type_of_url parameter.

Props hmbashar, huzaifaalmesbah, rejaulalomkhan, mai21, rahulsprajapati, martinkrcho, ankitkumarshah, adamsilverstein, sourabhjain.
Fixes #61393.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (3 diffs)
• tests/phpunit/tests/general/paginateLinks.php (modified) (1 diff)

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

@@ -4714 +4714 @@
         }
         $link .= $args['add_fragment'];
+        $link  = get_option( 'permalink_structure' ) ? user_trailingslashit( $link, 'paged' ) : $link;
 
         $page_links[] = sprintf(
@@ -4746 +4747 @@
                 }
                 $link .= $args['add_fragment'];
+                $link  = get_option( 'permalink_structure' ) ? user_trailingslashit( $link, 'paged' ) : $link;
 
                 $page_links[] = sprintf(
@@ -4770 +4772 @@
         }
         $link .= $args['add_fragment'];
+        $link  = get_option( 'permalink_structure' ) ? user_trailingslashit( $link, 'paged' ) : $link;
 
         $page_links[] = sprintf(

trunk/tests/phpunit/tests/general/paginateLinks.php

@@ -363 +363 @@
         $this->assertContains( "<a class=\"page-numbers\" href=\"$page_2_url\">2</a>", $links );
     }
+
+    /**
+     * @ticket 61393
+     */
+    public function test_pagination_links_with_trailing_slash() {
+        $this->set_permalink_structure( '/%postname%/' );
+
+        $args = array(
+            'base'      => 'http://example.org/category/test/%_%',
+            'format'    => 'page/%#%',
+            'total'     => 5,
+            'current'   => 2,
+            'prev_next' => true,
+        );
+
+        $links = paginate_links( $args );
+
+        // Test page 1 link (should have trailing slash)
+        $this->assertStringContainsString(
+            'href="http://example.org/category/test/"',
+            $links,
+            'Page 1 link should have trailing slash when permalink structure has trailing slash'
+        );
+
+        // Test page 3 link (should have trailing slash)
+        $this->assertStringContainsString(
+            'href="http://example.org/category/test/page/3/"',
+            $links,
+            'Page 3 link should have trailing slash when permalink structure has trailing slash'
+        );
+
+        // Test previous link (should have trailing slash)
+        $this->assertStringContainsString(
+            'class="prev page-numbers" href="http://example.org/category/test/"',
+            $links,
+            'Previous link should have trailing slash when permalink structure has trailing slash'
+        );
+    }
+
+    /**
+     * @ticket 61393
+     */
+    public function test_pagination_links_without_trailing_slash() {
+        $this->set_permalink_structure( '/%postname%' );
+
+        $args = array(
+            'base'      => 'http://example.org/category/test/%_%',
+            'format'    => 'page/%#%',
+            'total'     => 5,
+            'current'   => 2,
+            'prev_next' => true,
+        );
+
+        $links = paginate_links( $args );
+
+        // Test page 1 link (should not have trailing slash)
+        $this->assertStringContainsString(
+            'href="http://example.org/category/test"',
+            $links,
+            'Page 1 link should not have trailing slash when permalink structure has no trailing slash'
+        );
+
+        // Test page 3 link (should not have trailing slash)
+        $this->assertStringContainsString(
+            'href="http://example.org/category/test/page/3"',
+            $links,
+            'Page 3 link should not have trailing slash when permalink structure has no trailing slash'
+        );
+
+        // Test previous link (should not have trailing slash)
+        $this->assertStringContainsString(
+            'class="prev page-numbers" href="http://example.org/category/test"',
+            $links,
+            'Previous link should not have trailing slash when permalink structure has no trailing slash'
+        );
+    }
 }