Ticket #3944: post-php2.diff

post.php

@@ -83 +83 @@
                 $mn = $_POST['mn'];
                 $ss = $_POST['ss'];
                 $jj = ($jj > 31 ) ? 31 : $jj;
-                $hh = ($hh > 23 ) ? $hh -24 : $hh;
-                $mn = ($mn > 59 ) ? $mn -60 : $mn;
-                $ss = ($ss > 59 ) ? $ss -60 : $ss;
-                $_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-                $_POST['post_date_gmt'] = get_gmt_from_date( "$aa-$mm-$jj $hh:$mn:$ss" );
+                $hh %= 24;
+                $mn %= 60;
+                $ss %= 60;
+
+                
+                // Ensure a real, valid date here before saving to database 
+            // by converting to a Unix timestamp and then back 
+            $tmp_post_date = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss ); 
+            $tmp_post_date = strtotime( $tmp_post_date ); 
+            $tmp_post_date = date('Y-m-d H:i:s', $tmp_post_date ); 
+                         
+            $_POST['post_date'] = $tmp_post_date; 
+            $_POST['post_date_gmt'] = get_gmt_from_date( $tmp_post_date );
         }
 
         // Meta Stuff
@@ -274 +282 @@
                 $mn = $_POST['mn'];
                 $ss = $_POST['ss'];
                 $jj = ($jj > 31 ) ? 31 : $jj;
-                $hh = ($hh > 23 ) ? $hh -24 : $hh;
-                $mn = ($mn > 59 ) ? $mn -60 : $mn;
-                $ss = ($ss > 59 ) ? $ss -60 : $ss;
-                $_POST['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
-                $_POST['post_date_gmt'] = get_gmt_from_date( $_POST['post_date'] );
+                $hh %= 24;
+                $mn %= 60;
+                $ss %= 60;
+
+                
+                // Ensure a real, valid date here before saving to database 
+                // by converting to a Unix timestamp and then back 
+            $tmp_post_date = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss ); 
+            $tmp_post_date = strtotime( $tmp_post_date ); 
+            $tmp_post_date = date('Y-m-d H:i:s', $tmp_post_date ); 
+                         
+            $_POST['post_date'] = $tmp_post_date; 
+            $_POST['post_date_gmt'] = get_gmt_from_date( $tmp_post_date ); 
         }
 
         // Create the post.