WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@434 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 26 insertions, 4 deletions

diff --git a/wp-inst/wp-includes/functions-post.php b/wp-inst/wp-includes/functions-post.php
index 9f368ee..9134244 100644
--- a/wp-inst/wp-includes/functions-post.php
+++ b/wp-inst/wp-includes/functions-post.php
@@ -54,10 +54,17 @@ function wp_insert_post($postarr = array()) {
 		$post_name = sanitize_title($post_name);
 	}
 	
-	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) ) {
 		if ( $update )
@@ -382,6 +389,21 @@ function wp_update_post($postarr = array()) {
 	$postarr = array_merge($post, $postarr);
 	$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);
 }