Ticket #29972: 29972.2.diff

2586a2587
> <?php
2598d2598
<               $query_args = urlencode_deep( $query_args );
2619c2619
<               'add_args' => $query_args, // array of query args to add
---
>               'add_args' => false, // array of query args to add
2622c2622,2623
<               'after_page_number' => ''
---
>               'after_page_number' => '',
>               'link_current' => false,
2643a2645
>       $page_link_data = array();
2644a2647
>       $active = false;
2660c2663,2668
<               $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
---
>               $page_link_data[] = array(
>                       'type' => 'prev',
>                       'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
>                       'text' => $prev_text,
>                       'active' => false,
>               );
2663,2664c2671,2685
<               if ( $n == $current ) :
<                       $page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
---
>               if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
>                       $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
>                       $link = str_replace( '%#%', $n, $link );
>                       if ( $add_args ) {
>                               $link = add_query_arg( $add_args, $link );
>                       }
>                       $link .= $args['add_fragment'];
> 
>                       /** This filter is documented in wp-includes/general-template.php */
>                       $page_link_data[] = array(
>                               'type' => 'page',
>                               'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
>                               'text' => number_format_i18n( $n ),
>                               'active' => ( $n == $current ),
>                       );
2666,2680c2687,2694
<               else :
<                       if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
<                               $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
<                               $link = str_replace( '%#%', $n, $link );
<                               if ( $add_args )
<                                       $link = add_query_arg( $add_args, $link );
<                               $link .= $args['add_fragment'];
< 
<                               /** This filter is documented in wp-includes/general-template.php */
<                               $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
<                               $dots = true;
<                       elseif ( $dots && ! $args['show_all'] ) :
<                               $page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>';
<                               $dots = false;
<                       endif;
---
>               elseif ( $dots && !$args['show_all'] ) :
>                       $page_link_data[] = array(
>                               'type' => 'dots',
>                               'link' => null,
>                               'text' => __( '&hellip;' ),
>                               'active' => false,
>                       );
>                       $dots = false;
2691c2705,2734
<               $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
---
>               $page_link_data[] = array(
>                       'type' => 'next',
>                       'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
>                       'text' => $next_text,
>                       'active' => false,
>               );
>       endif;
>       // If we just want the data without the HTML, then we don't need to
>       // process the HTML here.
>       if ( $args['type'] != 'array_raw' ) :
>               foreach ( $page_link_data as $page_link ) :
>                       switch( $page_link['type'] ) {
>                               case 'prev':
>                                       $page_links[] = '<a class="prev page-numbers" href="' . $page_link['text'] . '">' . $prev_text . '</a>';
>                                       break;
>                               case 'next':
>                                       $page_links[] = '<a class="next page-numbers" href="' . $page_link['text'] . '">' . $next_text . '</a>';
>                                       break;
>                               case 'dots':
>                                       $page_links[] = '<span class="page-numbers dots">' . $page_link['text'] . '</span>';
>                                       break;
>                               case 'page':
>                                       if ( ! $args['link_current'] && $page_link['active'] ) {
>                                               $page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . $page_link['text'] . $args['after_page_number'] . "</span>";
>                                       } else {
>                                               $page_links[] = "<a class='" . ($page_link['active'] ? 'current ' : null) . "page-numbers' href='" . $page_link['link'] . "'>" . $args['before_page_number'] . $page_link['text'] . $args['after_page_number'] . "</a>";
>                                       }
>                                       break;
>                       }
>               endforeach;
2693a2737,2739
>               case 'array_raw' :
>                       return $page_link_data;
>