vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate use of extract() in wp_link_pages().

Browse Source 
Adds unit tests to a new file: `tests/post/template.php`. 
There were previously no unit tests for `wp_link_pages()`.
	
See #22400.


git-svn-id: https://develop.svn.wordpress.org/trunk@28398 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-05-15 00:43:40 +00:00
parent 9e07b1037e
commit 21e0370e5c
2 changed files with 103 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/wp-includes/post-template.php
View File

@ -739,29 +739,28 @@ function wp_link_pages( $args = '' ) {
'echo' => 1
);
$r = wp_parse_args( $args, $defaults );
$params = wp_parse_args( $args, $defaults );
/**
* Filter the arguments used in retrieving page links for paginated posts.
*
* @since 3.0.0
*
* @param array $r An array of arguments for page links for paginated posts.
* @param array $params An array of arguments for page links for paginated posts.
*/
$r = apply_filters( 'wp_link_pages_args', $r );
extract( $r, EXTR_SKIP );
$r = apply_filters( 'wp_link_pages_args', $params );
global $page, $numpages, $multipage, $more;
$output = '';
if ( $multipage ) {
if ( 'number' == $next_or_number ) {
$output .= $before;
if ( 'number' == $r['next_or_number'] ) {
$output .= $r['before'];
for ( $i = 1; $i <= $numpages; $i++ ) {
$link = $link_before . str_replace( '%', $i, $pagelink ) . $link_after;
if ( $i != $page || ! $more && 1 == $page )
$link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
if ( $i != $page || ! $more && 1 == $page ) {
$link = _wp_link_page( $i ) . $link . '</a>';
}
/**
* Filter the HTML output of individual page number links.
*
@ -771,28 +770,28 @@ function wp_link_pages( $args = '' ) {
* @param int $i Page number for paginated posts' page links.
*/
$link = apply_filters( 'wp_link_pages_link', $link, $i );
$output .= $separator . $link;
$output .= $r['separator'] . $link;
}
$output .= $after;
$output .= $r['after'];
} elseif ( $more ) {
$output .= $before;
$i = $page - 1;
if ( $i ) {
$link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . '</a>';
$output .= $r['before'];
$prev = $page - 1;
if ( $prev ) {
$link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
/** This filter is documented in wp-includes/post-template.php */
$link = apply_filters( 'wp_link_pages_link', $link, $i );
$output .= $separator . $link;
$link = apply_filters( 'wp_link_pages_link', $link, $prev );
$output .= $r['separator'] . $link;
}
$i = $page + 1;
if ( $i <= $numpages ) {
$link = _wp_link_page( $i ) . $link_before . $nextpagelink . $link_after . '</a>';
$next = $page + 1;
if ( $next <= $numpages ) {
$link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>';
/** This filter is documented in wp-includes/post-template.php */
$link = apply_filters( 'wp_link_pages_link', $link, $i );
$output .= $separator . $link;
$link = apply_filters( 'wp_link_pages_link', $link, $next );
$output .= $r['separator'] . $link;
}
$output .= $after;
$output .= $r['after'];
}
}
@ -801,15 +800,15 @@ function wp_link_pages( $args = '' ) {
*
* @since 3.6.0
*
* @param string $output HTML output of paginated posts' page links.
* @param string $html HTML output of paginated posts' page links.
* @param array $args An array of arguments.
*/
$output = apply_filters( 'wp_link_pages', $output, $args );
$html = apply_filters( 'wp_link_pages', $output, $args );
if ( $echo )
echo $output;
return $output;
if ( $r['echo'] ) {
echo $html;
}
return $html;
}
/**

75
tests/phpunit/tests/post/template.php Normal file
View File

@ -0,0 +1,75 @@
<?php
class Tests_Post_Template extends WP_UnitTestCase {
function test_wp_link_pages() {
$contents = array( 'One', 'Two', 'Three' );
$content = join( '<!--nextpage-->', $contents );
$post_id = $this->factory->post->create( array( 'post_content' => $content ) );
$this->go_to( '?p=' . $post_id );
setup_postdata( get_post( $post_id ) );
$permalink = sprintf( '<a href="%s">', get_permalink() );
$page2 = _wp_link_page( 2 );
$page3 = _wp_link_page( 3 );
$expected = "<p>Pages: 1 {$page2}2</a> {$page3}3</a></p>";
$output = wp_link_pages( array( 'echo' => 0 ) );
$this->assertEquals( $expected, $output );
$before_after = " 1 {$page2}2</a> {$page3}3</a>";
$output = wp_link_pages( array( 'echo' => 0, 'before' => '', 'after' => '' ) );
$this->assertEquals( $before_after, $output );
$separator = "1{$page2}2</a>{$page3}3</a>";
$output = wp_link_pages( array( 'echo' => 0, 'before' => '', 'after' => '', 'separator' => '' ) );
$this->assertEquals( $separator, $output );
$link = "<em>1</em>{$page2}<em>2</em></a>{$page3}<em>3</em></a>";
$output = wp_link_pages( array( 'echo' => 0, 'before' => '', 'after' => '', 'separator' => '',
'link_before' => '<em>', 'link_after' => '</em>'
) );
$this->assertEquals( $link, $output );
$next = "{$page2}<em>Next page</em></a>";
$output = wp_link_pages( array( 'echo' => 0, 'before' => '', 'after' => '', 'separator' => '',
'link_before' => '<em>', 'link_after' => '</em>', 'next_or_number' => 'next'
) );
$this->assertEquals( $next, $output );
$GLOBALS['page'] = 2;
$next_prev = "{$permalink}<em>Previous page</em></a>{$page3}<em>Next page</em></a>";
$output = wp_link_pages( array( 'echo' => 0, 'before' => '', 'after' => '', 'separator' => '',
'link_before' => '<em>', 'link_after' => '</em>', 'next_or_number' => 'next'
) );
$this->assertEquals( $next_prev, $output );
$next_prev_link = "{$permalink}Woo page</a>{$page3}Hoo page</a>";
$output = wp_link_pages( array( 'echo' => 0, 'before' => '', 'after' => '', 'separator' => '',
'next_or_number' => 'next', 'nextpagelink' => 'Hoo page', 'previouspagelink' => 'Woo page'
) );
$this->assertEquals( $next_prev_link, $output );
$GLOBALS['page'] = 1;
$separator = "<p>Pages: | 1 | {$page2}2</a> | {$page3}3</a></p>";
$output = wp_link_pages( array( 'echo' => 0, 'separator' => ' | ' ) );
$this->assertEquals( $separator, $output );
$pagelink = " | Page 1 | {$page2}Page 2</a> | {$page3}Page 3</a>";
$output = wp_link_pages( array( 'echo' => 0, 'separator' => ' | ', 'before' => '', 'after' => '',
'pagelink' => 'Page %'
) );
$this->assertEquals( $pagelink, $output );
}
}