<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28785] trunk: Cleanup after [28671]:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28785">28785</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-20 17:11:14 +0000 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup after <a href="http://core.trac.wordpress.org/changeset/28671">[28671]</a>:
* Set better defaults in `paginate_links()`, so that themes don't have to calculate them on their own, like Twenty Fourteen does now.
* Don't set page 1 to `?page=1` or `/page/1/` - that will force a canonical redirect.
* Add and cleanup unit tests
Props obenland, SergeyBiryukov, wonderboymusic.
Fixes <a href="http://core.trac.wordpress.org/ticket/24606">#24606</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralpaginateLinksphp">trunk/tests/phpunit/tests/general/paginateLinks.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/general-template.php (28784 => 28785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/general-template.php 2014-06-20 16:29:47 UTC (rev 28784)
+++ trunk/src/wp-includes/general-template.php 2014-06-20 17:11:14 UTC (rev 28785)
</span><span class="lines">@@ -2438,11 +2438,29 @@
</span><span class="cx"> * @return array|string String of page links or array of page links.
</span><span class="cx"> */
</span><span class="cx"> function paginate_links( $args = '' ) {
</span><ins>+ global $wp_query, $wp_rewrite;
+
+ $total = ( isset( $wp_query->max_num_pages ) ) ? $wp_query->max_num_pages : 1;
+ $current = ( 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 ( 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=%#%';
+
</ins><span class="cx"> $defaults = array(
</span><del>- 'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
- 'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
- 'total' => 1,
- 'current' => 0,
</del><ins>+ 'base' => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
+ 'format' => $format, // ?page=%#% : %#% is replaced by the page number
+ 'total' => $total,
+ 'current' => $current,
</ins><span class="cx"> 'show_all' => false,
</span><span class="cx"> 'prev_next' => true,
</span><span class="cx"> 'prev_text' => __('« Previous'),
</span><span class="lines">@@ -2476,10 +2494,10 @@
</span><span class="cx"> $r = '';
</span><span class="cx"> $page_links = array();
</span><span class="cx"> $dots = false;
</span><del>- $base = str_replace( '%_%', $args['format'], $args['base'] );
</del><span class="cx">
</span><span class="cx"> if ( $args['prev_next'] && $current && 1 < $current ) :
</span><del>- $link = str_replace( '%#%', $current - 1, $base );
</del><ins>+ $link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
+ $link = str_replace( '%#%', $current - 1, $link );
</ins><span class="cx"> if ( $add_args )
</span><span class="cx"> $link = add_query_arg( $add_args, $link );
</span><span class="cx"> $link .= $args['add_fragment'];
</span><span class="lines">@@ -2499,7 +2517,8 @@
</span><span class="cx"> $dots = true;
</span><span class="cx"> else :
</span><span class="cx"> if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
</span><del>- $link = str_replace( '%#%', $n, $base );
</del><ins>+ $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
+ $link = str_replace( '%#%', $n, $link );
</ins><span class="cx"> if ( $add_args )
</span><span class="cx"> $link = add_query_arg( $add_args, $link );
</span><span class="cx"> $link .= $args['add_fragment'];
</span><span class="lines">@@ -2514,7 +2533,8 @@
</span><span class="cx"> endif;
</span><span class="cx"> endfor;
</span><span class="cx"> if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) :
</span><del>- $link = str_replace( '%#%', $current + 1, $base );
</del><ins>+ $link = str_replace( '%_%', $args['format'], $args['base'] );
+ $link = str_replace( '%#%', $current + 1, $link );
</ins><span class="cx"> if ( $add_args )
</span><span class="cx"> $link = add_query_arg( $add_args, $link );
</span><span class="cx"> $link .= $args['add_fragment'];
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralpaginateLinksphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/general/paginateLinks.php (28784 => 28785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/general/paginateLinks.php 2014-06-20 16:29:47 UTC (rev 28784)
+++ trunk/tests/phpunit/tests/general/paginateLinks.php 2014-06-20 17:11:14 UTC (rev 28785)
</span><span class="lines">@@ -4,11 +4,24 @@
</span><span class="cx">
</span><span class="cx"> private $i18n_count = 0;
</span><span class="cx">
</span><ins>+ function setUp() {
+ parent::setUp();
+
+ $this->go_to( home_url( '/' ) );
+ }
+
</ins><span class="cx"> function test_defaults() {
</span><ins>+ $page2 = get_pagenum_link( 2 );
+ $page3 = get_pagenum_link( 3 );
+ $page50 = get_pagenum_link( 50 );
+
</ins><span class="cx"> $expected =<<<EXPECTED
</span><del>-<a class='page-numbers' href=''>1</a>
</del><ins>+<span class='page-numbers current'>1</span>
+<a class='page-numbers' href='$page2'>2</a>
+<a class='page-numbers' href='$page3'>3</a>
</ins><span class="cx"> <span class="page-numbers dots">…</span>
</span><del>-<a class='page-numbers' href='?page=50'>50</a>
</del><ins>+<a class='page-numbers' href='$page50'>50</a>
+<a class="next page-numbers" href="$page2">Next »</a>
</ins><span class="cx"> EXPECTED;
</span><span class="cx">
</span><span class="cx"> $links = paginate_links( array( 'total' => 50 ) );
</span><span class="lines">@@ -16,24 +29,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_format() {
</span><ins>+ $page2 = home_url( '/page/2/' );
+ $page3 = home_url( '/page/3/' );
+ $page50 = home_url( '/page/50/' );
+
</ins><span class="cx"> $expected =<<<EXPECTED
</span><del>-<a class='page-numbers' href=''>1</a>
</del><ins>+<span class='page-numbers current'>1</span>
+<a class='page-numbers' href='$page2'>2</a>
+<a class='page-numbers' href='$page3'>3</a>
</ins><span class="cx"> <span class="page-numbers dots">…</span>
</span><del>-<a class='page-numbers' href='/page/50/'>50</a>
</del><ins>+<a class='page-numbers' href='$page50'>50</a>
+<a class="next page-numbers" href="$page2">Next »</a>
</ins><span class="cx"> EXPECTED;
</span><span class="cx">
</span><del>- $links = paginate_links( array( 'total' => 50, 'format' => '/page/%#%/' ) );
</del><ins>+ $links = paginate_links( array( 'total' => 50, 'format' => 'page/%#%/' ) );
</ins><span class="cx"> $this->assertEquals( $expected, $links );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_prev_next_false() {
</span><ins>+ $home = home_url( '/' );
+ $page3 = get_pagenum_link( 3 );
+ $page4 = get_pagenum_link( 4 );
+ $page50 = get_pagenum_link( 50 );
+
</ins><span class="cx"> $expected =<<<EXPECTED
</span><del>-<a class='page-numbers' href=''>1</a>
</del><ins>+<a class='page-numbers' href='$home'>1</a>
</ins><span class="cx"> <span class='page-numbers current'>2</span>
</span><del>-<a class='page-numbers' href='?page=3'>3</a>
-<a class='page-numbers' href='?page=4'>4</a>
</del><ins>+<a class='page-numbers' href='$page3'>3</a>
+<a class='page-numbers' href='$page4'>4</a>
</ins><span class="cx"> <span class="page-numbers dots">…</span>
</span><del>-<a class='page-numbers' href='?page=50'>50</a>
</del><ins>+<a class='page-numbers' href='$page50'>50</a>
</ins><span class="cx"> EXPECTED;
</span><span class="cx">
</span><span class="cx"> $links = paginate_links( array( 'total' => 50, 'prev_next' => false, 'current' => 2 ) );
</span><span class="lines">@@ -41,15 +66,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_prev_next_true() {
</span><ins>+ $home = home_url( '/' );
+ $page3 = get_pagenum_link( 3 );
+ $page4 = get_pagenum_link( 4 );
+ $page50 = get_pagenum_link( 50 );
+
</ins><span class="cx"> $expected =<<<EXPECTED
</span><del>-<a class="prev page-numbers" href="">« Previous</a>
-<a class='page-numbers' href=''>1</a>
</del><ins>+<a class="prev page-numbers" href="$home">« Previous</a>
+<a class='page-numbers' href='$home'>1</a>
</ins><span class="cx"> <span class='page-numbers current'>2</span>
</span><del>-<a class='page-numbers' href='?page=3'>3</a>
-<a class='page-numbers' href='?page=4'>4</a>
</del><ins>+<a class='page-numbers' href='$page3'>3</a>
+<a class='page-numbers' href='$page4'>4</a>
</ins><span class="cx"> <span class="page-numbers dots">…</span>
</span><del>-<a class='page-numbers' href='?page=50'>50</a>
-<a class="next page-numbers" href="?page=3">Next »</a>
</del><ins>+<a class='page-numbers' href='$page50'>50</a>
+<a class="next page-numbers" href="$page3">Next »</a>
</ins><span class="cx"> EXPECTED;
</span><span class="cx">
</span><span class="cx"> $links = paginate_links( array( 'total' => 50, 'prev_next' => true, 'current' => 2 ) );
</span><span class="lines">@@ -95,8 +125,8 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // It's supposed to link to page 1:
</span><del>- $this->assertTag( array( 'tag' => 'a', 'attributes' => array( 'href' => '?page=1' ) ), $links[0] );
- $this->assertTag( array( 'tag' => 'a', 'attributes' => array( 'href' => '?page=1' ) ), $links[1] );
</del><ins>+ $this->assertTag( array( 'tag' => 'a', 'attributes' => array( 'href' => 'http://' . WP_TESTS_DOMAIN . '/' ) ), $links[0] );
+ $this->assertTag( array( 'tag' => 'a', 'attributes' => array( 'href' => 'http://' . WP_TESTS_DOMAIN . '/' ) ), $links[1] );
</ins><span class="cx">
</span><span class="cx"> // It's not supposed to have an empty href.
</span><span class="cx"> $this->assertNotTag( array( 'tag' => 'a', 'attributes' => array( 'class' => 'prev page-numbers', 'href' => '' ) ), $links[0] );
</span><span class="lines">@@ -112,7 +142,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->assertTag( array( 'tag' => 'span', 'attributes' => array( 'class' => 'current' ) ), $links[0] );
</span><del>- $this->assertTag( array( 'tag' => 'a', 'attributes' => array( 'href' => '?page=2' ) ), $links[1] );
</del><ins>+ $this->assertTag( array( 'tag' => 'a', 'attributes' => array( 'href' => get_pagenum_link( 2 ) ) ), $links[1] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>