diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 2fa888c9b..c784ad9cd 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -95,6 +95,8 @@ if ( 0 != $post->ID ) {
$stamp = __('Published on:
%1$s');
} else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
$stamp = __('Publish immediately');
+ } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+ $stamp = __('Schedule for:
%1$s');
} else { // draft, 1 or more saves, date specified
$stamp = __('Publish on:
%1$s');
}
@@ -106,7 +108,8 @@ if ( 0 != $post->ID ) {
?>
@@ -132,16 +135,14 @@ switch ( $post->post_status ) {
}
?>
-post_status || 'private' == $post->post_status ) { ?>
+post_status || 'private' == $post->post_status || $can_publish ) { ?>
-
-
+
@@ -171,8 +172,10 @@ if ( $can_publish OR ( $post->post_status == 'publish' AND current_user_can('edi
-post_status && 'private' != $post->post_status ) { ?>
+post_status && 'private' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
+post_status && $can_publish ) { ?>
+
post_status ) { ?>
@@ -197,7 +200,11 @@ if ( ( 'edit' == $action ) && current_user_can('delete_post', $post->ID) ) { ?>
post_status, array('publish', 'future') ) || 0 == $post->ID ) { ?>
-
+ post_date_gmt . ' +0000' ) ) : ?>
+
+
+
+
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index ec35a7341..2642c0dc8 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2236,6 +2236,12 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
$mn = ($edit) ? mysql2date( 'i', $post_date ) : gmdate( 'i', $time_adj );
$ss = ($edit) ? mysql2date( 's', $post_date ) : gmdate( 's', $time_adj );
+ $cur_jj = gmdate( 'd', $time_adj );
+ $cur_mm = gmdate( 'm', $time_adj );
+ $cur_aa = gmdate( 'Y', $time_adj );
+ $cur_hh = gmdate( 'H', $time_adj );
+ $cur_mn = gmdate( 'i', $time_adj );
+
$month = "