Ticket #29294: 29294.patch

src/wp-admin/post.php

@@ -229 +229 @@
         $post_id = edit_post();
 
         // 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
 

src/wp-includes/js/autosave.js

@@ -286 +286 @@
                                                 });
                                         }
 
-                                        wpCookies.set( 'wp-saving-post-' + post_id, 'check' );
+                                        wpCookies.set( 'wp-saving-post', post_id + '-check', 24 * 60 * 60 );
                                 });
                         }
 
@@ -309 +309 @@
                         function checkPost() {
                                 var content, post_title, excerpt, $notice,
                                         postData = getSavedPostData(),
-                                        cookie = wpCookies.get( 'wp-saving-post-' + post_id );
+                                        cookie = wpCookies.get( 'wp-saving-post' );
 
-                                if ( ! postData ) {
+                                if ( cookie === post_id + '-saved' ) {
+                                        wpCookies.remove( 'wp-saving-post' );
+                                        // The post was saved properly, remove old data and bail
+                                        setData( false );
                                         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;
-                                        }
+                                if ( ! postData ) {
+                                        return;
                                 }
 
                                 // There is a newer autosave. Don't show two "restore" notices at the same time.