Changeset 3074 for trunk/wp-includes/functions-post.php

Timestamp:

11/14/2005 09:56:41 AM (19 years ago)

Author:

matt

Message:

Fixes #1837 timestamp funkiness

File:

• trunk/wp-includes/functions-post.php (modified) (2 diffs)

trunk/wp-includes/functions-post.php

@@ -55 +55 @@
     }
     
-    if (empty($post_date))
-        $post_date = current_time('mysql');
-    if (empty($post_date_gmt)) 
-        $post_date_gmt = get_gmt_from_date($post_date);
+
+    // If the post date is empty (due to having been new or a draft) and status is not 'draft', set date to now
+    if (empty($post_date)) {
+        if ( 'draft' != $post_status )
+            $post_date = current_time('mysql');
+    }
+
+    if (empty($post_date_gmt)) {
+        if ( 'draft' != $post_status )
+            $post_date_gmt = get_gmt_from_date($post_date);
+    }
 
     if ( empty($comment_status) ) {
@@ -383 +390 @@
     $postarr['post_category'] = $post_cats; 
 
+    // Drafts shouldn't be assigned a date unless explicitly done so by the user
+    if ( 'draft' == $post['post_status'] && empty($postarr['edit_date']) && empty($postarr['post_date']) && 
+         ('0000-00-00 00:00:00' == $post['post_date']) )
+        $clear_date = true;
+    else
+        $clear_date = false;
+
+    // Merge old and new fields with new fields overwriting old ones.
+    $postarr = array_merge($post, $postarr);
+    $postarr['post_category'] = $post_cats; 
+    if ( $clear_date ) {
+        $postarr['post_date'] = '';
+        $postarr['post_date_gmt'] = '';
+    }
+
     return wp_insert_post($postarr);
 }