<!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>[25280] trunk: Check bad dates and redirect, instead of 404ing, as necessary and appropriate.</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/25280">25280</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-06 16:35:22 +0000 (Fri, 06 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check bad dates and redirect, instead of 404ing, as necessary and appropriate.
Adds query, conditional, and canonical Unit Tests.
Props kovshenin, SergeyBiryukov, DrewAPicture.
Fixes <a href="http://core.trac.wordpress.org/ticket/10935">#10935</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalphp">trunk/tests/phpunit/tests/canonical.php</a></li>
<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/canonical.php (25279 => 25280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/canonical.php 2013-09-06 15:17:35 UTC (rev 25279)
+++ trunk/src/wp-includes/canonical.php 2013-09-06 16:35:22 UTC (rev 25280)
</span><span class="lines">@@ -101,6 +101,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( get_query_var( 'day' ) && get_query_var( 'monthnum' ) && get_query_var( 'year' ) ) {
+ $year = get_query_var( 'year' );
+ $month = get_query_var( 'monthnum' );
+ $day = get_query_var( 'day' );
+ $date = sprintf( '%04d-%02d-%02d', $year, $month, $day );
+ if ( ! wp_checkdate( $month, $day, $year, $date ) ) {
+ $redirect_url = get_month_link( $year, $month );
+ $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum', 'day' ), $redirect_url );
+ }
+ } elseif ( get_query_var( 'monthnum' ) && get_query_var( 'year' ) && 12 < get_query_var( 'monthnum' ) ) {
+ $redirect_url = get_year_link( get_query_var( 'year' ) );
+ $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum' ), $redirect_url );
+ }
+
</ins><span class="cx"> if ( ! $redirect_url ) {
</span><span class="cx"> if ( $redirect_url = redirect_guess_404_permalink() ) {
</span><span class="cx"> $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (25279 => 25280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2013-09-06 15:17:35 UTC (rev 25279)
+++ trunk/src/wp-includes/query.php 2013-09-06 16:35:22 UTC (rev 25280)
</span><span class="lines">@@ -1513,15 +1513,24 @@
</span><span class="cx">
</span><span class="cx"> if ( $qv['day'] ) {
</span><span class="cx"> if ( ! $this->is_date ) {
</span><del>- $this->is_day = true;
- $this->is_date = true;
</del><ins>+ $date = sprintf( '%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day'] );
+ if ( $qv['monthnum'] && $qv['year'] && ! wp_checkdate( $qv['monthnum'], $qv['day'], $qv['year'], $date ) ) {
+ $qv['error'] = '404';
+ } else {
+ $this->is_day = true;
+ $this->is_date = true;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $qv['monthnum'] ) {
</span><span class="cx"> if ( ! $this->is_date ) {
</span><del>- $this->is_month = true;
- $this->is_date = true;
</del><ins>+ if ( 12 < $qv['monthnum'] ) {
+ $qv['error'] = '404';
+ } else {
+ $this->is_month = true;
+ $this->is_date = true;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/canonical.php (25279 => 25280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/canonical.php 2013-09-06 15:17:35 UTC (rev 25279)
+++ trunk/tests/phpunit/tests/canonical.php 2013-09-06 16:35:22 UTC (rev 25280)
</span><span class="lines">@@ -239,6 +239,9 @@
</span><span class="cx">
</span><span class="cx"> array( '/?year=2008', '/2008/'),
</span><span class="cx">
</span><ins>+ array( '/2012/13/', '/2012/'),
+ array( '/2012/11/51/', '/2012/11/'),
+
</ins><span class="cx"> // Authors
</span><span class="cx"> array( '/?author=%d', '/author/canonical-author/' ),
</span><span class="cx"> // array( '/?author=%d&year=2008', '/2008/?author=3'),
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/conditionals.php (25279 => 25280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/conditionals.php 2013-09-06 15:17:35 UTC (rev 25279)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2013-09-06 16:35:22 UTC (rev 25280)
</span><span class="lines">@@ -629,4 +629,12 @@
</span><span class="cx"> // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/attachment/([^/]+)/trackback/?$' => 'index.php?attachment=$matches[1]&tb=1',
</span><span class="cx"> // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/attachment/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?attachment=$matches[1]&feed=$matches[2]',
</span><span class="cx"> // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/attachment/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?attachment=$matches[1]&feed=$matches[2]',
</span><ins>+
+ function test_bad_dates() {
+ $this->go_to( '/2013/13/13/' );
+ $this->assertQueryTrue( 'is_404' );
+
+ $this->go_to( '/2013/11/41/' );
+ $this->assertQueryTrue( 'is_404' );
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/results.php (25279 => 25280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/results.php 2013-09-06 15:17:35 UTC (rev 25279)
+++ trunk/tests/phpunit/tests/query/results.php 2013-09-06 16:35:22 UTC (rev 25280)
</span><span class="lines">@@ -486,4 +486,51 @@
</span><span class="cx"> $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
</span><span class="cx"> $this->assertEqualSets( array( $author_1 ), $author_ids );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 10935
+ */
+ function test_query_is_date() {
+ $this->q->query( array(
+ 'year' => '2007',
+ 'monthnum' => '01',
+ 'day' => '01',
+ ) );
+
+ $this->assertTrue( $this->q->is_date );
+ $this->assertTrue( $this->q->is_day );
+ $this->assertFalse( $this->q->is_month );
+ $this->assertFalse( $this->q->is_year );
+
+ $this->q->query( array(
+ 'year' => '2007',
+ 'monthnum' => '01',
+ ) );
+
+ $this->assertTrue( $this->q->is_date );
+ $this->assertFalse( $this->q->is_day );
+ $this->assertTrue( $this->q->is_month );
+ $this->assertFalse( $this->q->is_year );
+
+ $this->q->query( array(
+ 'year' => '2007',
+ ) );
+
+ $this->assertTrue( $this->q->is_date );
+ $this->assertFalse( $this->q->is_day );
+ $this->assertFalse( $this->q->is_month );
+ $this->assertTrue( $this->q->is_year );
+
+ $this->q->query( array(
+ 'year' => '2007',
+ 'monthnum' => '01',
+ 'day' => '50',
+ ) );
+
+ $this->assertTrue( $this->q->is_404 );
+ $this->assertFalse( $this->q->is_date );
+ $this->assertFalse( $this->q->is_day );
+ $this->assertFalse( $this->q->is_month );
+ $this->assertFalse( $this->q->is_year );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>