diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-15 15:11:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-15 15:11:20 +0000 |
| commit | 3f977686eee95c98da001dd3652c68200faabfe2 (patch) | |
| tree | eb5abf6dddabdd2adf081ec4fbac464506c57739 /wp-includes | |
| parent | bfa3b629e0d67016ec83050c5db762479af40609 (diff) | |
| download | wordpress-mu-3f977686eee95c98da001dd3652c68200faabfe2.tar.gz wordpress-mu-3f977686eee95c98da001dd3652c68200faabfe2.tar.xz wordpress-mu-3f977686eee95c98da001dd3652c68200faabfe2.zip | |
WP Merge with WP 2.6.1
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1424 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
| -rw-r--r-- | wp-includes/post.php | 4 | ||||
| -rw-r--r-- | wp-includes/version.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/wp-includes/post.php b/wp-includes/post.php index a4a0b5e..bf7d922 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1276,14 +1276,14 @@ function wp_insert_post($postarr = array(), $wp_error = false) { } // 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 ( empty($post_date) || '0000-00-00 00:00:00' == $post_date ) { if ( !in_array($post_status, array('draft', 'pending')) ) $post_date = current_time('mysql'); else $post_date = '0000-00-00 00:00:00'; } - if (empty($post_date_gmt)) { + if ( empty($post_date_gmt) || '0000-00-00 00:00:00' == $post_date_gmt ) { if ( !in_array($post_status, array('draft', 'pending')) ) $post_date_gmt = get_gmt_from_date($post_date); else diff --git a/wp-includes/version.php b/wp-includes/version.php index bcf7aa7..75405a5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -8,7 +8,7 @@ * * @global string $wp_version */ -$wp_version = '2.6.1-beta2'; +$wp_version = '2.6.1'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. @@ -17,5 +17,5 @@ $wp_version = '2.6.1-beta2'; */ $wp_db_version = 8204; -$wpmu_version = '2.6-beta1'; +$wpmu_version = '2.6.1-beta1'; ?> |