Ticket #29808: 29808-pagination.diff

src/wp-includes/link-template.php

@@ -2304 +2304 @@
  * @return string Markup for pagination links.
  */
 function get_the_pagination( $args = array() ) {
-        $navigation = '';
+        global $wp_query, $wp_rewrite;
 
         // Don't print empty markup if there's only one page.
-        if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-                $args = wp_parse_args( $args, array(
-                        'mid_size'           => 1,
-                        'prev_text'          => __( 'Previous' ),
-                        'next_text'          => __( 'Next' ),
-                        'screen_reader_text' => __( 'Posts navigation' ),
-                ) );
-                // Make sure we get plain links, so we can work with it.
-                $args['type'] = 'plain';
+        if ( $wp_query->max_num_pages < 2 ) {
+                return;
+        }
 
-                // Set up paginated links.
-                $links = paginate_links( $args );
+        $paged        = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
+        $pagenum_link = html_entity_decode( get_pagenum_link() );
+        $query_args   = array();
+        $url_parts    = explode( '?', $pagenum_link );
 
-                if ( $links ) {
-                        $navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] );
-                }
+        if ( isset( $url_parts[1] ) ) {
+                wp_parse_str( $url_parts[1], $query_args );
+        }
+
+        $pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
+        $pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
+
+        $format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
+        $format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+
+        $args = wp_parse_args( $args, array(
+                'base'               => $pagenum_link,
+                'format'             => $format,
+                'add_args'           => array_map( 'urlencode', $query_args ),
+                'total'              => $wp_query->max_num_pages,
+                'current'            => $paged,
+                'mid_size'           => 1,
+                'prev_text'          => __( 'Previous' ),
+                'next_text'          => __( 'Next' ),
+                'screen_reader_text' => __( 'Posts navigation' ),
+        ) );
+
+        $navigation = '';
+
+        // Set up paginated links.
+        $links = paginate_links( $args );
+
+        if ( $links ) {
+                $navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] );
         }
 
         return $navigation;