Changeset 25280

Timestamp:

09/06/2013 04:35:22 PM (11 years ago)

Author:

wonderboymusic

Message:

Check bad dates and redirect, instead of 404ing, as necessary and appropriate.
Adds query, conditional, and canonical Unit Tests.

Props kovshenin, SergeyBiryukov, DrewAPicture.
Fixes #10935.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• src/wp-includes/query.php (modified) (2 diffs)
• tests/phpunit/tests/canonical.php (modified) (1 diff)
• tests/phpunit/tests/query/conditionals.php (modified) (1 diff)
• tests/phpunit/tests/query/results.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -100 +100 @@
                 $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
             }
+        }
+
+        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 );
         }
 

trunk/src/wp-includes/query.php

@@ -1514 +1514 @@
             if ( $qv['day'] ) {
                 if ( ! $this->is_date ) {
-                    $this->is_day = true;
-                    $this->is_date = true;
+                    $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;
+                    }
                 }
             }
@@ -1521 +1526 @@
             if ( $qv['monthnum'] ) {
                 if ( ! $this->is_date ) {
-                    $this->is_month = true;
-                    $this->is_date = true;
+                    if ( 12 < $qv['monthnum'] ) {
+                        $qv['error'] = '404';
+                    } else {
+                        $this->is_month = true;
+                        $this->is_date = true;
+                    }
                 }
             }

trunk/tests/phpunit/tests/canonical.php

@@ -240 +240 @@
             array( '/?year=2008', '/2008/'),
 
+            array( '/2012/13/', '/2012/'),
+            array( '/2012/11/51/', '/2012/11/'),
+
             // Authors
             array( '/?author=%d', '/author/canonical-author/' ),

trunk/tests/phpunit/tests/query/conditionals.php

@@ -630 +630 @@
     // '[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]',
     // '[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]',
+
+    function test_bad_dates() {
+        $this->go_to( '/2013/13/13/' );
+        $this->assertQueryTrue( 'is_404' );
+
+        $this->go_to( '/2013/11/41/' );
+        $this->assertQueryTrue( 'is_404' );
+    }
 }

trunk/tests/phpunit/tests/query/results.php

@@ -487 +487 @@
         $this->assertEqualSets( array( $author_1 ), $author_ids );
     }
+
+    /**
+     * @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 );
+    }
 }