From 555dc83d90ea6750ae26d0c823e8768e14443173 Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Tue, 25 Mar 2025 15:18:12 +0000
Subject: [PATCH] Permalinks: Revert [59966].

The original commit ignores some of the arguments that can be passed to the function, mainly `base` and `format`. Reverting for now.

Props peterwilsoncc.


Built from https://develop.svn.wordpress.org/trunk@60088


git-svn-id: http://core.svn.wordpress.org/trunk@59424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 3 ---
 wp-includes/version.php          | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 2f23f0e878..f0cd895719 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -4713,7 +4713,6 @@ function paginate_links( $args = '' ) {
 			$link = add_query_arg( $add_args, $link );
 		}
 		$link .= $args['add_fragment'];
-		$link  = get_option( 'permalink_structure' ) ? user_trailingslashit( $link, 'paged' ) : $link;
 
 		$page_links[] = sprintf(
 			'<a class="prev page-numbers" href="%s">%s</a>',
@@ -4746,7 +4745,6 @@ function paginate_links( $args = '' ) {
 					$link = add_query_arg( $add_args, $link );
 				}
 				$link .= $args['add_fragment'];
-				$link  = get_option( 'permalink_structure' ) ? user_trailingslashit( $link, 'paged' ) : $link;
 
 				$page_links[] = sprintf(
 					'<a class="page-numbers" href="%s">%s</a>',
@@ -4771,7 +4769,6 @@ function paginate_links( $args = '' ) {
 			$link = add_query_arg( $add_args, $link );
 		}
 		$link .= $args['add_fragment'];
-		$link  = get_option( 'permalink_structure' ) ? user_trailingslashit( $link, 'paged' ) : $link;
 
 		$page_links[] = sprintf(
 			'<a class="next page-numbers" href="%s">%s</a>',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 60ee47f919..cfc458450a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.8-beta3-60087';
+$wp_version = '6.8-beta3-60088';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.