Ticket #12507: pagination_base.diff

wp-includes/link-template.php

@@ -1382 +1382 @@
                         $query_string = '';
                 }
 
-                $request = preg_replace( '|page/\d+/?$|', '', $request);
+                $pagination_base = get_pagination_base();
+
+                $request = preg_replace( "|$pagination_base/\d+/?$|", '', $request);
                 $request = preg_replace( '|^index\.php|', '', $request);
                 $request = ltrim($request, '/');
 
@@ -1392 +1394 @@
                         $base .= 'index.php/';
 
                 if ( $pagenum > 1 ) {
-                        $request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( 'page/' . $pagenum, 'paged' );
+                        $request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( "$pagination_base/" . $pagenum, 'paged' );
                 }
 
                 $result = $base . $request . $query_string;
@@ -1403 +1405 @@
         return $result;
 }
 
+function get_pagination_base() {
+        return apply_filters('pagination_base', 'page');
+}
+
 /**
  * Retrieve next posts pages link.
  *

wp-includes/rewrite.php

@@ -1293 +1293 @@
 
                 //build a regex to match the trackback and page/xx parts of URLs
                 $trackbackregex = 'trackback/?$';
-                $pageregex = 'page/?([0-9]{1,})/?$';
+                $pageregex = get_pagination_base() . '/?([0-9]{1,})/?$';
                 $commentregex = 'comment-page-([0-9]{1,})/?$';
 
                 //build up an array of endpoint regexes to append => queries to append