Ticket #12507: pagination_base.3.diff

wp-includes/post.php

@@ -2417 +2417 @@
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode( "', '", esc_sql( $hierarchical_post_types ) ) . "' ) AND ID != %d AND post_parent = %d LIMIT 1";
                 $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID, $post_parent ) );
 
-                if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( '@^(page)?\d+$@', $slug ) ) {
+                if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug ) ) {
                         $suffix = 2;
                         do {
                                 $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
@@ -4585 +4585 @@
 
                 add_filter('the_preview', '_set_preview');
         }
-}
- No newline at end of file
+}

wp-includes/link-template.php

@@ -1387 +1387 @@
                         $query_string = '';
                 }
 
-                $request = preg_replace( '|page/\d+/?$|', '', $request);
+                $request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
                 $request = preg_replace( '|^index\.php|', '', $request);
                 $request = ltrim($request, '/');
 
@@ -1397 +1397 @@
                         $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( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
                 }
 
                 $result = $base . $request . $query_string;

wp-includes/rewrite.php

@@ -480 +480 @@
         var $comments_base = 'comments';
 
         /**
+         * Pagination permalink base.
+         *
+         * @since 3.1.0
+         * @access private
+         * @var string
+         */
+        var $pagination_base = 'page';
+
+        /**
          * Feed permalink base.
          *
          * @since 1.5.0
@@ -1279 +1288 @@
 
                 //build a regex to match the trackback and page/xx parts of URLs
                 $trackbackregex = 'trackback/?$';
-                $pageregex = 'page/?([0-9]{1,})/?$';
+                $pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
                 $commentregex = 'comment-page-([0-9]{1,})/?$';
 
                 //build up an array of endpoint regexes to append => queries to append

wp-includes/canonical.php

@@ -178 +178 @@
                         $paged_redirect = @parse_url($redirect_url);
                         while ( preg_match( '#/page/?[0-9]+?(/+)?$#', $paged_redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $paged_redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $paged_redirect['path'] ) ) {
                                 // Strip off paging and feed
-                                $paged_redirect['path'] = preg_replace('#/page/?[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing paging
+                                $paged_redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $paged_redirect['path']); // strip off any existing paging
                                 $paged_redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $paged_redirect['path']); // strip off feed endings
                                 $paged_redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing comment paging
                         }