<!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>[34492] trunk: Canonical/Rewrite: sanity check posts that are paged with `<!--nextpage-->`.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34492">34492</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34492","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-24 14:03:05 +0000 (Thu, 24 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Canonical/Rewrite: sanity check posts that are paged with `<!--nextpage-->`. Page numbers past the max number of pages are returning the last page of content and causing infinite duplicate content.
Awesome rewrite bug: the `page` query var was being set to `'/4'` in `$wp`. When cast to `int`, it returns `0` (Bless you, PHP). `WP_Query` calls `trim( $page, '/' )` when setting its own query var. The few places that were checking `page` before posts were queried now have sanity checks, so that these changes work without flushing rewrites.
Adds/updates unit tests.
Props wonderboymusic, dd32.
See <a href="https://core.trac.wordpress.org/ticket/11694">#11694</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunksrcwpincludesrewritefunctionsphp">trunk/src/wp-includes/rewrite-functions.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalphp">trunk/tests/phpunit/tests/canonical.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscanonicalpagedphp">trunk/tests/phpunit/tests/canonical/paged.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescanonicalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2015-09-24 13:38:03 UTC (rev 34491)
+++ trunk/src/wp-includes/canonical.php 2015-09-24 14:03:05 UTC (rev 34492)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,6 +148,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_query_var( 'page' ) && $wp_query->post &&
+ false !== strpos( $wp_query->post->post_content, '<!--nextpage-->' ) ) {
+ $redirect['path'] = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
+ $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+ $redirect_url = get_permalink( $wp_query->post->ID );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_attachment() && ! $redirect_url ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +567,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'feed' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( get_query_var( 'page' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> return get_permalink( $post_id );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswprewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-rewrite.php 2015-09-24 13:38:03 UTC (rev 34491)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2015-09-24 14:03:05 UTC (rev 34492)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,8 +1071,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sub1 .= '?$';
</span><span class="cx" style="display: block; padding: 0 10px"> $sub2 .= '?$';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //post pagination, e.g. <permalink>/2/
- $match = $match . '(/[0-9]+)?/?$';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Post pagination, e.g. <permalink>/2/
+ // Previously: '(/[0-9]+)?/?$', which produced '/2' for page.
+ // When cast to int, returned 0.
+ $match = $match . '(?:/([0-9]+))?/?$';
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
</span><span class="cx" style="display: block; padding: 0 10px"> } else { //not matching a permalink so this is a lot simpler
</span><span class="cx" style="display: block; padding: 0 10px"> //close the match and finalise the query
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2015-09-24 13:38:03 UTC (rev 34491)
+++ trunk/src/wp-includes/class-wp.php 2015-09-24 14:03:05 UTC (rev 34492)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,7 +587,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wp_query
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function handle_404() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_query;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_query, $wp;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we've already issued a 404, bail.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_404() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,16 +596,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Never 404 for the admin, robots, or if we found posts.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() || is_robots() || $wp_query->posts ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Only set X-Pingback for single posts.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $success = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $p = clone $wp_query->post;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only set X-Pingback for single posts that allow pings.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $p && pings_open( $p ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> @header( 'X-Pingback: ' . get_bloginfo( 'pingback_url' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // check for paged content that exceeds the max number of pages
+ $next = '<!--nextpage-->';
+ if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $wp->query_vars['page'] ) ) {
+ $page = trim( $wp->query_vars['page'], '/' );
+ $success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- status_header( 200 );
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $success ) {
+ status_header( 200 );
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We will 404 for paged queries, as no posts were found.
</span></span></pre></div>
<a id="trunksrcwpincludesrewritefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rewrite-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rewrite-functions.php 2015-09-24 13:38:03 UTC (rev 34491)
+++ trunk/src/wp-includes/rewrite-functions.php 2015-09-24 14:03:05 UTC (rev 34492)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,6 +256,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'monthnum' === $compare && isset( $query_vars['day'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_page = $query_vars['day'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bug found in #11694 - 'page' was returning '/4'
+ $maybe_page = (int) trim( $maybe_page, '/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_page_count = substr_count( $post->post_content, '<!--nextpage-->' ) + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpagedphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/canonical/paged.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/paged.php (rev 0)
+++ trunk/tests/phpunit/tests/canonical/paged.php 2015-09-24 14:03:05 UTC (rev 34492)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,25 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * @group canonical
+ * @group rewrite
+ * @group query
+ */
+class Tests_Canonical_Paged extends WP_Canonical_UnitTestCase {
+
+ function test_nextpage() {
+ $para = 'This is a paragraph.
+ This is a paragraph.
+ This is a paragraph.';
+ $next = '<!--nextpage-->';
+
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_content' => "{$para}{$next}{$para}{$next}{$para}"
+ ) );
+
+ $link = parse_url( get_permalink( $post_id ), PHP_URL_PATH );
+ $paged = $link . '4/';
+
+ $this->assertCanonical( $paged, $link );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical.php 2015-09-24 13:38:03 UTC (rev 34491)
+++ trunk/tests/phpunit/tests/canonical.php 2015-09-24 14:03:05 UTC (rev 34492)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/2010/post-format-test-au/', '/2008/06/02/post-format-test-audio/'), // A Year the post is not in
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/2008/09/03/images-test/3/', array( 'url' => '/2008/09/03/images-test/3/', 'qv' => array( 'name' => 'images-test', 'year' => '2008', 'monthnum' => '09', 'day' => '03', 'page' => '/3' ) ) ), // page = /3 ?!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( '/2008/09/03/images-test/3/', array( 'url' => '/2008/09/03/images-test/3/', 'qv' => array( 'name' => 'images-test', 'year' => '2008', 'monthnum' => '09', 'day' => '03', 'page' => '3' ) ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( '/2008/09/03/images-test/?page=3', '/2008/09/03/images-test/3/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>