From 6d5bbd04bcb0c3c0d3c198605fef67c1d0ee0ef9 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Mon, 25 Mar 2013 23:43:06 +0000
Subject: [PATCH] Local autosave: remove the locally stored data after a post
 is saved. This prevents false positives when several users edit the same post
 multiple times. See #23220

git-svn-id: https://develop.svn.wordpress.org/trunk@23796 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/js/autosave.js | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/wp-includes/js/autosave.js b/wp-includes/js/autosave.js
index aa988cb681..43b2b4eb88 100644
--- a/wp-includes/js/autosave.js
+++ b/wp-includes/js/autosave.js
@@ -423,8 +423,11 @@ wp.autosave.local = {
 	},
 
 	/**
-	 * Set (save) post data in the storage
+	 * Set (save or delete) post data in the storage.
 	 *
+	 * If stored_data evaluates to 'false' the storage key for the current post will be removed
+	 *
+	 * $param stored_data The post data to store or null/false/empty to delete the key
 	 * @return bool
 	 */
 	setData: function( stored_data ) {
@@ -433,7 +436,12 @@ wp.autosave.local = {
 		if ( !stored || !post_id )
 			return false;
 
-		stored[ 'post_' + post_id ] = stored_data;
+		if ( stored_data )
+			stored[ 'post_' + post_id ] = stored_data;
+		else if ( stored.hasOwnProperty( 'post_' + post_id ) )
+			delete stored[ 'post_' + post_id ];
+		else
+			return false;
 
 		return this.setStorage(stored);
 	},
@@ -470,8 +478,8 @@ wp.autosave.local = {
 		result = this.setData( post_data );
 
 		// temp logging
-		if ( this.debug )
-			console.log( 'saved, post content = %s', post_data.content );
+		if ( typeof console != 'undefined' )
+			console.log( 'Local autosave: saved, post content = %s', post_data.content );
 
 		if ( result )
 			this.lastsaveddata = post_data.post_title + ': ' + post_data.content;
@@ -566,23 +574,29 @@ wp.autosave.local = {
 		var self = this, post_data = this.getData(), content, check_data, strip_tags = false, notice,
 			post_id = $('#post_ID').val() || 0, cookie = wpCookies.get( 'wp-saving-post-' + post_id );
 
+		// temp logging
+		if ( typeof console != 'undefined' )
+			console.log( 'Local autosave: checkPost, cookie = %s, post content = %s', cookie, post_data && post_data.content );
+
 		if ( ! post_data )
 			return;
 
-		if ( cookie )
+		if ( cookie ) {
 			wpCookies.remove( 'wp-saving-post-' + post_id );
 
+			if ( cookie == 'saved' ) {
+				// The post was saved properly, remove old data and bail
+				this.setData( false );
+				return;
+			}
+		}
+
 		// There is a newer autosave. Don't show two "restore" notices at the same time.
 		if ( $('#has-newer-autosave').length )
 			return;
 
-		// temp logging
-		if ( typeof console != 'undefined' )
-			console.log( 'checkPost, post content = %s', post_data.content );
-
-		if ( cookie == 'saved' ) {
-			return;
-		} else if ( cookie != 'check' ) {
+		// cookie == 'check' means the post was not saved properly, always show #local-storage-notice
+		if ( cookie != 'check' ) {
 			content = $('#content').val();
 			check_data = $.extend( {}, post_data );