Ticket #10935: canonical-bad-dates.diff

wp-includes/functions.php

@@ -3497 +3497 @@
 }
 
 /**
+ * Validates day as 1-31 or specific to month when passed
+ *
+ * @since 3.5.0
+ * @param int $day
+ * @param int $month
+ * @return bool
+ */
+function wp_is_valid_day( $day, $month, $year ) {
+        return checkdate( $month, $day, $year );
+}
+
+/**
+ * Validates month as 1-12
+ *
+ * @since 3.5.0
+ * @param int $month
+ * @return bool
+ */
+function wp_is_valid_month( $month ) {
+        $month = (int) $month;
+        
+        return ! ( empty( $month ) || 12 < $month );
+}
+
+/**
  * Finds hierarchy loops using a callback function that maps object IDs to parent IDs.
  *
  * @since 3.1.0

wp-includes/query.php

@@ -1501 +1501 @@
 
                         if ( $qv['day'] ) {
                                 if ( ! $this->is_date ) {
-                                        $this->is_day = true;
-                                        $this->is_date = true;
+                                        if ( $qv['monthnum'] &&  $qv['year'] && ! wp_is_valid_day( $qv['day'], $qv['monthnum'], $qv['year'] ) ) {
+                                                $qv['error'] = '404';
+                                        } else {
+                                                $this->is_day = true;
+                                                $this->is_date = true;                                          
+                                        }
                                 }
                         }
 
-                        if ( $qv['monthnum'] ) {
+                        if ( $qv['monthnum'] ) {                                
                                 if ( ! $this->is_date ) {
-                                        $this->is_month = true;
-                                        $this->is_date = true;
+                                        if ( wp_is_valid_month( $qv['monthnum'] ) ) {
+                                                $this->is_month = true;
+                                                $this->is_date = true;
+                                        } else {
+                                                $qv['error'] = '404';
+                                        }
                                 }
                         }
 

wp-includes/canonical.php

@@ -101 +101 @@
                         }
                 }
 
+                if ( get_query_var( 'day' ) && get_query_var( 'monthnum' ) && get_query_var( 'year' ) && ! wp_is_valid_day( get_query_var( 'day' ), get_query_var( 'monthnum' ), get_query_var( 'year' ) ) ) {
+                        $redirect_url = get_month_link( get_query_var( 'year' ), get_query_var( 'monthnum' ) );
+                        $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' ) && ! wp_is_valid_month( 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 );