Changeset 25280 for trunk/src/wp-includes/query.php

Timestamp:

09/06/2013 04:35:22 PM (13 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.

File:

• trunk/src/wp-includes/query.php (modified) (2 diffs)

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