Changeset 29572

Timestamp:

08/22/2014 12:24:56 AM (10 years ago)

Author:

azaozz

Message:

Autosave: prevent setting multiple stale wp-saving-post-* cookies when the browser disregards "session cookies" expiration on quit:

• Add expiration time of 24 hours for these cookies.
• Rename them to wp-saving-post (no post_id) so there is never more than one cookie per domain.

Fixes #29294.

Location:

trunk/src

Files:

• wp-admin/post.php (modified) (1 diff)
• wp-includes/js/autosave.js (modified) (3 diffs)

trunk/src/wp-admin/post.php

@@ -230 +230 @@
 
     // Session cookie flag that the post was saved
-    if ( isset( $_COOKIE['wp-saving-post-' . $post_id] ) )
-        setcookie( 'wp-saving-post-' . $post_id, 'saved' );
+    if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
+        setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS );
+    }
 
     redirect_post($post_id); // Send user on their way while we keep working

trunk/src/wp-includes/js/autosave.js

@@ -287 +287 @@
                     }
 
-                    wpCookies.set( 'wp-saving-post-' + post_id, 'check' );
+                    wpCookies.set( 'wp-saving-post', post_id + '-check', 24 * 60 * 60 );
                 });
             }
@@ -310 +310 @@
                 var content, post_title, excerpt, $notice,
                     postData = getSavedPostData(),
-                    cookie = wpCookies.get( 'wp-saving-post-' + post_id );
+                    cookie = wpCookies.get( 'wp-saving-post' );
+
+                if ( cookie === post_id + '-saved' ) {
+                    wpCookies.remove( 'wp-saving-post' );
+                    // The post was saved properly, remove old data and bail
+                    setData( false );
+                    return;
+                }
 
                 if ( ! postData ) {
                     return;
-                }
-
-                if ( cookie ) {
-                    wpCookies.remove( 'wp-saving-post-' + post_id );
-
-                    if ( cookie === 'saved' ) {
-                        // The post was saved properly, remove old data and bail
-                        setData( false );
-                        return;
-                    }
                 }
 
@@ -335 +332 @@
                 excerpt = $( '#excerpt' ).val() || '';
 
-                // cookie == 'check' means the post was not saved properly, always show #local-storage-notice
-                if ( cookie !== 'check' && compare( content, postData.content ) &&
-                    compare( post_title, postData.post_title ) && compare( excerpt, postData.excerpt ) ) {
+                if ( compare( content, postData.content ) && compare( post_title, postData.post_title ) &&
+                    compare( excerpt, postData.excerpt ) ) {
 
                     return;