Ticket #8368: garyc40.8368.diff

wp-admin/css/wp-admin.dev.css

@@ -2339 +2339 @@
         border-style: solid;
 }
 
+#timestampdiv input[type=radio] {
+        margin-right:10px;
+}
 
 /*------------------------------------------------------------------------------
   11.1 - Custom Fields

wp-admin/includes/post.php

@@ -94 +94 @@
         if (!isset( $post_data['ping_status'] ))
                 $post_data['ping_status'] = 'closed';
 
-        foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-                if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
-                        $post_data['edit_date'] = '1';
-                        break;
+        // publish_immediately radio box is only displayed when editing scheduled post
+        // so it's safe to assume that when we encounter this value, the new status is 'publish'
+        if ( ! empty( $post_data['publish_immediately'] ) ) {
+                $post_data['post_status'] = 'publish';
+                
+                // cancel the scheduled date
+                $post_data['post_date'] = current_time( 'mysql' );
+                $post_data['post_date_gmt'] = '';
+        } else {
+                foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
+                        if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
+                                $post_data['edit_date'] = '1';
+                                break;
+                        }
                 }
         }
 

wp-admin/includes/template.php

@@ -594 +594 @@
 
         $time_adj = current_time('timestamp');
         $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
+        $radio_boxes = ( $post->post_status == 'future' ); // only display radio boxes if post is scheduled
         $jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
         $mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
         $aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
@@ -622 +623 @@
         $minute = '<input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
 
         echo '<div class="timestamp-wrap">';
+        
+        if ( $radio_boxes ) {
+                echo '<label for="publish-immediately"><input type="radio" name="publish_immediately" value="1" id="publish-immediately" />' . __( 'Immediately' ) . '</label><br />';
+                echo '<input type="radio" id="publish-future" name="publish_immediately" value="0" checked="checked" />';
+        }
+
         /* translators: 1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input */
         printf(__('%1$s%2$s, %3$s @ %4$s : %5$s'), $month, $day, $year, $hour, $minute);
 

wp-admin/js/post.dev.js

@@ -249 +249 @@
                 });
         }
 
+        $('#aa, #mm, #jj, #hh, #mn').change(function(){
+                $('#publish-future').attr('checked', true);
+                updateText();
+        });
+        
+        $('#timestampdiv input[type=radio]').change(function(){
+                updateText();
+        });
+
         // categories
         $('.categorydiv').each( function(){
                 var this_id = $(this).attr('id'), noSyncChecks = false, syncChecks, catAddAfter, taxonomyParts, taxonomy, settingName;
@@ -374 +383 @@
                                 $('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid');
                         }
 
-                        if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
-                                publishOn = postL10n.publishOnFuture;
-                                $('#publish').val( postL10n.schedule );
-                        } else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
+                        if ( ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) || $('#publish-immediately').is(':checked') ) {
                                 publishOn = postL10n.publishOn;
                                 $('#publish').val( postL10n.publish );
+                        } else if ( attemptedDate > currentDate && attemptedDate.toUTCString() != originalDate.toUTCString() ) {
+                                publishOn = postL10n.publishOnFuture;
+                                $('#publish').val( postL10n.schedule );
                         } else {
                                 publishOn = postL10n.publishOnPast;
                                 $('#publish').val( postL10n.update );
                         }
-                        if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack
+                        if ( $('#publish-immediately').is(':checked') ) {
+                                $('#timestamp').html(postL10n.publishImmediately);
+                        } else if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack
                                 $('#timestamp').html(stamp);
                         } else {
                                 $('#timestamp').html(
@@ -395 +406 @@
                                         hh + ':' +
                                         mn + '</b> '
                                 );
+                                $('#publish-future').attr('checked', true);
                         }
 
                         if ( $('input:radio:checked', '#post-visibility-select').val() == 'private' ) {
@@ -493 +505 @@
                         $('#hh').val($('#hidden_hh').val());
                         $('#mn').val($('#hidden_mn').val());
                         $('#timestampdiv').siblings('a.edit-timestamp').show();
+                        $('#publish-future').attr('checked', true);
                         updateText();
                         return false;
                 });

wp-includes/post.php

@@ -2653 +2653 @@
                 $post_cats = $postarr['post_category'];
         else
                 $post_cats = $post['post_category'];
-
+        
         // Drafts shouldn't be assigned a date unless explicitly done so by the user
-        if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-                         ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
-                $clear_date = true;
-        else
-                $clear_date = false;
+        $clear_date = isset( $post['post_status'] ) && in_array( $post['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) && empty( $postarr['edit_date'] )
+                                        && ( '0000-00-00 00:00:00' == $post['post_date_gmt'] );
 
         // Merge old and new fields with new fields overwriting old ones.
         $postarr = array_merge($post, $postarr);

wp-includes/script-loader.php

@@ -338 +338 @@
                         'password' => __('Password Protected'),
                         'privatelyPublished' => __('Privately Published'),
                         'published' => __('Published'),
-                        'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
+                        'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};',
+                        'publishImmediately' => __('Publish <b>immediately</b>'),
                 ) );
 
                 $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20090526' );