Ticket #10935: 10935.5.diff

tests/phpunit/tests/query/conditionals.php

@@ -629 +629 @@
         // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/attachment/([^/]+)/trackback/?$' => 'index.php?attachment=$matches[1]&tb=1',
         // '[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' );
+        }
 }

tests/phpunit/tests/canonical.php

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

src/wp-includes/query.php

@@ -1513 +1513 @@
 
                         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;
+                                        }
                                 }
                         }
 
                         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;
+                                        }
                                 }
                         }
 

src/wp-includes/canonical.php

@@ -101 +101 @@
                         }
                 }
 
+                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 );
+                }
+
                 if ( ! $redirect_url ) {
                         if ( $redirect_url = redirect_guess_404_permalink() ) {
                                 $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 );