WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminate use of `extract()` in `paginate_links()`. Adds unit tests. Moves `tests/general/template.php` (which only had one method) to `tests/general/paginateLinks.php`. 

See #22400.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28225 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-14 22:29:14 +00:00
parent 1121efb54c
commit d5acdd82c8
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
wp-includes/general-template.php
View File

@ -2447,26 +2447,32 @@ function paginate_links( $args = '' ) {
); );
$args = wp_parse_args( $args, $defaults ); $args = wp_parse_args( $args, $defaults );
extract($args, EXTR_SKIP);
// Who knows what else people pass in $args // Who knows what else people pass in $args
$total = (int) $total; $total = (int) $args['total'];
if ( $total < 2 ) if ( $total < 2 ) {
return; return;
$current = (int) $current; }
$end_size = 0 < (int) $end_size ? (int) $end_size : 1; // Out of bounds? Make it the default. $current = (int) $args['current'];
$mid_size = 0 <= (int) $mid_size ? (int) $mid_size : 2; $end_size = (int) $args['end_size']; // Out of bounds? Make it the default.
$add_args = is_array($add_args) ? $add_args : false; if ( $end_size < 1 ) {
$end_size = 1;
}
$mid_size = (int) $args['mid_size'];
if ( $mid_size < 0 ) {
$mid_size = 2;
}
$add_args = is_array( $args['add_args'] ) ? $args['add_args'] : false;
$r = ''; $r = '';
$page_links = array(); $page_links = array();
$dots = false; $dots = false;
if ( $prev_next && $current && 1 < $current ) : if ( $args['prev_next'] && $current && 1 < $current ) :
$link = str_replace('%_%', 2 == $current ? '' : $format, $base); $link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
$link = str_replace('%#%', $current - 1, $link); $link = str_replace( '%#%', $current - 1, $link );
if ( $add_args ) if ( $add_args )
$link = add_query_arg( $add_args, $link ); $link = add_query_arg( $add_args, $link );
$link .= $add_fragment; $link .= $args['add_fragment'];
/** /**
* Filter the paginated links for the given archive pages. * Filter the paginated links for the given archive pages.
@ -2475,40 +2481,40 @@ function paginate_links( $args = '' ) {
* *
* @param string $link The paginated link URL. * @param string $link The paginated link URL.
*/ */
$page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $prev_text . '</a>'; $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
endif; endif;
for ( $n = 1; $n <= $total; $n++ ) : for ( $n = 1; $n <= $total; $n++ ) :
if ( $n == $current ) : if ( $n == $current ) :
$page_links[] = "<span class='page-numbers current'>" . $before_page_number . number_format_i18n( $n ) . $after_page_number . "</span>"; $page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
$dots = true; $dots = true;
else : else :
if ( $show_all || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) : 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 ? '' : $format, $base); $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
$link = str_replace('%#%', $n, $link); $link = str_replace( '%#%', $n, $link );
if ( $add_args ) if ( $add_args )
$link = add_query_arg( $add_args, $link ); $link = add_query_arg( $add_args, $link );
$link .= $add_fragment; $link .= $args['add_fragment'];
/** This filter is documented in wp-includes/general-template.php */ /** This filter is documented in wp-includes/general-template.php */
$page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $before_page_number . number_format_i18n( $n ) . $after_page_number . "</a>"; $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; $dots = true;
elseif ( $dots && !$show_all ) : elseif ( $dots && ! $args['show_all'] ) :
$page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>'; $page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>';
$dots = false; $dots = false;
endif; endif;
endif; endif;
endfor; endfor;
if ( $prev_next && $current && ( $current < $total || -1 == $total ) ) : if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) :
$link = str_replace('%_%', $format, $base); $link = str_replace( '%_%', $args['format'], $args['base'] );
$link = str_replace('%#%', $current + 1, $link); $link = str_replace( '%#%', $current + 1, $link );
if ( $add_args ) if ( $add_args )
$link = add_query_arg( $add_args, $link ); $link = add_query_arg( $add_args, $link );
$link .= $add_fragment; $link .= $args['add_fragment'];
/** This filter is documented in wp-includes/general-template.php */ /** This filter is documented in wp-includes/general-template.php */
$page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $next_text . '</a>'; $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
endif; endif;
switch ( $type ) { switch ( $args['type'] ) {
case 'array' : case 'array' :
return $page_links; return $page_links;