Ticket #6043: 6043.3.diff

wp-includes/js/autosave.js

@@ -1 +1 @@
 var autosaveLast = '';
 var autosavePeriodical;
+var autosaveOldMessage = '';
 
 jQuery(function($) {
         autosaveLast = $('#post #title').val()+$('#post #content').val();
@@ -17 +18 @@
 
 // called when autosaving pre-existing post
 function autosave_saved(response) {
-        var oldMessage = jQuery('#autosave').html();
         var res = wpAjax.parseAjaxResponse(response, 'autosave'); // parse the ajax response
         var message = '';
 
@@ -39 +39 @@
                 }
         }
         if ( message ) { jQuery('#autosave').html(message); } // update autosave message
-        else if ( oldMessage && res ) { jQuery('#autosave').html( oldMessage ); }
+        else if ( autosaveOldMessage && res ) { jQuery('#autosave').html( autosaveOldMessage ); }
         autosave_enable_buttons(); // re-enable disabled form buttons
         return res;
 }
@@ -180 +180 @@
                 post_data['autosave'] = 0;
         }
 
+        autosaveOldMessage = jQuery('#autosave').html();
+
         jQuery.ajax({
                 data: post_data,
                 beforeSend: doAutoSave ? autosave_loading : null,

wp-admin/admin-ajax.php

@@ -472 +472 @@
         check_ajax_referer( 'autosave', 'autosavenonce' );
         global $current_user;
 
-        $_POST['post_content'] = $_POST['content'];
-        $_POST['post_excerpt'] = $_POST['excerpt'];
         $_POST['post_status'] = 'draft';
         $_POST['post_category'] = explode(",", $_POST['catslist']);
         $_POST['tags_input'] = explode(",", $_POST['tags_input']);
@@ -521 +519 @@
                                 die(__('You are not allowed to edit this post.'));
                 }
                 if ( $do_autosave ) {
-                        $id = wp_update_post($_POST);
+                        $id = edit_post();
                         $data = $message;
                 } else {
                         $id = $post->ID;

wp-admin/wp-admin.css

@@ -1215 +1215 @@
         border-bottom: 1px solid #ccc;
 }
 
+.submitbox #autosave .error {
+        color: #333;
+}
+
 /* Categories */
 
 #categorydiv #category-adder {

wp-admin/includes/post.php

@@ -113 +113 @@
         // Now that we have an ID we can fix any attachment anchor hrefs
         _fix_attachment_links( $post_ID );
 
+        wp_set_post_lock( $post_ID, $GLOBALS['current_user']->ID );
+
         return $post_ID;
 }
 
@@ -321 +323 @@
         // Now that we have an ID we can fix any attachment anchor hrefs
         _fix_attachment_links( $post_ID );
 
+        wp_set_post_lock( $post_ID, $GLOBALS['current_user']->ID );
+
         return $post_ID;
 }
 

wp-admin/post.php

@@ -69 +69 @@
         if ( $last = wp_check_post_lock( $post->ID ) ) {
                 $last_user = get_userdata( $last );
                 $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-                $message = sprintf( __( '%s is currently editing this post' ), wp_specialchars( $last_user_name ) );
+                $message = sprintf( __( 'Warning: %s is currently editing this post' ), wp_specialchars( $last_user_name ) );
                 $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
                 add_action('admin_notices', create_function( '', "echo '$message';" ) );
         } else {

wp-admin/edit-page-form.php

@@ -129 +129 @@
 <br class="clear" />
 <?php if ($post_ID): ?>
 <?php printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); ?>
+<br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
 </p>

wp-admin/edit-form-advanced.php

@@ -151 +151 @@
 <br class="clear" />
 <?php if ($post_ID): ?>
 <?php printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); ?>
+<br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
 </p>

wp-admin/page.php

@@ -60 +60 @@
         if ( $last = wp_check_post_lock( $post->ID ) ) {
                 $last_user = get_userdata( $last );
                 $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-                $message = sprintf( __( '%s is currently editing this page' ), wp_specialchars( $last_user_name ) );
+                $message = sprintf( __( 'Warning: %s is currently editing this page' ), wp_specialchars( $last_user_name ) );
                 $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
                 add_action('admin_notices', create_function( '', "echo '$message';" ) );
         } else {