-post_status && 'private' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
-
-post_status && $can_publish ) { ?>
-
+
+
+ID), true); ?> tabindex="4" />
+
-
-
-
+ID ) {
+ if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+ $stamp = __('Scheduled for:
%1$s');
+ } else if ( 'publish' == $post->post_status ) { // already published
+ $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');
+ }
+ $date = date_i18n( $datef, strtotime( $post->post_date ) );
+} else { // draft (no saves, and thus no date specified)
+ $stamp = __('Publish
immediately');
+ $date = date_i18n( $datef, strtotime( current_time('mysql') ) );
+}
+?>
+
+
+
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index d85c0e24b..bb03ec221 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -36,31 +36,35 @@ $url = attribute_escape( $comment->comment_author_url );