Ticket #17180: 17180.diff

wp-admin/includes/post.php

@@ -108 +108 @@
                 $hh = $post_data['hh'];
                 $mn = $post_data['mn'];
                 $ss = $post_data['ss'];
-                $aa = ($aa <= 0 ) ? date('Y') : $aa;
-                $mm = ($mm <= 0 ) ? date('n') : $mm;
-                $jj = ($jj > 31 ) ? 31 : $jj;
-                $jj = ($jj <= 0 ) ? date('j') : $jj;
+                if( ! checkdate( $mm, $jj, $aa ) )
+                        return new WP_Error( 'invalid_publish_date', __( 'The publish date you supplied is invalid.' ) );
+
                 $hh = ($hh > 23 ) ? $hh -24 : $hh;
                 $mn = ($mn > 59 ) ? $mn -60 : $mn;
                 $ss = ($ss > 59 ) ? $ss -60 : $ss;

wp-admin/js/post.dev.js

@@ -376 +376 @@
                         originalDate = new Date( $('#hidden_aa').val(), $('#hidden_mm').val() -1, $('#hidden_jj').val(), $('#hidden_hh').val(), $('#hidden_mn').val() );
                         currentDate = new Date( $('#cur_aa').val(), $('#cur_mm').val() -1, $('#cur_jj').val(), $('#cur_hh').val(), $('#cur_mn').val() );
 
+                        
                         if ( attemptedDate.getFullYear() != aa || (1 + attemptedDate.getMonth()) != mm || attemptedDate.getDate() != jj || attemptedDate.getMinutes() != mn ) {
                                 $('.timestamp-wrap', '#timestampdiv').addClass('form-invalid');
+                                $('#publish').prop('disabled', true);
                                 return false;
                         } else {
                                 $('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid');
+                                $('#publish').prop('disabled', false);
                         }
 
                         if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
@@ -489 +492 @@
                 $('#timestampdiv').siblings('a.edit-timestamp').click(function() {
                         if ($('#timestampdiv').is(":hidden")) {
                                 $('#timestampdiv').slideDown('fast');
+                                $('#publish').prop('disabled', true);
                                 $(this).hide();
                         }
                         return false;
@@ -503 +507 @@
                         $('#mn').val($('#hidden_mn').val());
                         $('#timestampdiv').siblings('a.edit-timestamp').show();
                         updateText();
+                        $('#publish').prop('disabled', false);
                         return false;
                 });