Changeset 21922

Timestamp:

09/20/2012 10:46:50 AM (11 years ago)

Author:

westi

Message:

Posting: Improve the invalid date protection code based on feedback from nacin.

• Introduce a wp_checkdate() function with a single filter to centralise the code that validates dates.
• Improve the error message
• Correctly handle the return value of wp_insert_post which is not always a WP_Error on failure

Fixes #17180

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -123 +123 @@
         $mn = ($mn > 59 ) ? $mn -60 : $mn;
         $ss = ($ss > 59 ) ? $ss -60 : $ss;
-        $valid_date = apply_filters( '_wp_translate_postdata_valid_date', checkdate( $mm, $jj, $aa ), $post_data );
+        $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
+        $valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
         if ( !$valid_date ) {
-            return new WP_Error( 'invalid_date', __( 'Woops, the provided date is invalid.' ) );
-        }
-        $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
+            return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+        }
         $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
     }

trunk/wp-includes/functions.php

@@ -3704 +3704 @@
 }
 
+/**
+ * Test if the supplied date is valid for the Gregorian calendar
+ *
+ * @since 3.5.0
+ *
+ * @return bool true|false
+ */
+function wp_checkdate( $month, $day, $year, $source_date ) {
+    return apply_filters( 'wp_checkdate', checkdate( $month, $day, $year ), $source_date );
+}

trunk/wp-includes/post.php

@@ -2638 +2638 @@
         $jj = substr( $post_date, 8, 2 );
         $aa = substr( $post_date, 0, 4 );
-        $valid_date = apply_filters( 'wp_insert_post_validate_date', checkdate( $mm, $jj, $aa ), $post_date );
+        $valid_date = wp_checkdate( $mm, $jj, $aa, $post_date );
         if ( !$valid_date ) {
-            return new WP_Error( 'invalid_date', __( 'Woops, the provided date is invalid.' ) );
+            if ( $wp_error )
+                return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+            else
+                return 0;
         }