Changeset 25280 for trunk/src/wp-includes/canonical.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/canonical.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 );
                 }