<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29572] trunk/src: Autosave: prevent setting multiple stale `wp-saving-post-*` cookies when the browser disregards "session cookies" expiration on quit:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29572">29572</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-08-22 00:24:56 +0000 (Fri, 22 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/29294">#29294</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpincludesjsautosavejs">trunk/src/wp-includes/js/autosave.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/post.php (29571 => 29572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/post.php 2014-08-22 00:13:07 UTC (rev 29571)
+++ trunk/src/wp-admin/post.php 2014-08-22 00:24:56 UTC (rev 29572)
</span><span class="lines">@@ -229,8 +229,9 @@
</span><span class="cx"> $post_id = edit_post();
</span><span class="cx">
</span><span class="cx"> // Session cookie flag that the post was saved
</span><del>- if ( isset( $_COOKIE['wp-saving-post-' . $post_id] ) )
- setcookie( 'wp-saving-post-' . $post_id, 'saved' );
</del><ins>+ if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
+ setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS );
+ }
</ins><span class="cx">
</span><span class="cx"> redirect_post($post_id); // Send user on their way while we keep working
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/autosave.js (29571 => 29572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/autosave.js 2014-08-22 00:13:07 UTC (rev 29571)
+++ trunk/src/wp-includes/js/autosave.js 2014-08-22 00:24:56 UTC (rev 29572)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wpCookies.set( 'wp-saving-post-' + post_id, 'check' );
</del><ins>+ wpCookies.set( 'wp-saving-post', post_id + '-check', 24 * 60 * 60 );
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -309,20 +309,17 @@
</span><span class="cx"> function checkPost() {
</span><span class="cx"> var content, post_title, excerpt, $notice,
</span><span class="cx"> postData = getSavedPostData(),
</span><del>- cookie = wpCookies.get( 'wp-saving-post-' + post_id );
</del><ins>+ cookie = wpCookies.get( 'wp-saving-post' );
</ins><span class="cx">
</span><del>- if ( ! postData ) {
</del><ins>+ if ( cookie === post_id + '-saved' ) {
+ wpCookies.remove( 'wp-saving-post' );
+ // The post was saved properly, remove old data and bail
+ setData( false );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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;
- }
</del><ins>+ if ( ! postData ) {
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // There is a newer autosave. Don't show two "restore" notices at the same time.
</span><span class="lines">@@ -334,9 +331,8 @@
</span><span class="cx"> post_title = $( '#title' ).val() || '';
</span><span class="cx"> excerpt = $( '#excerpt' ).val() || '';
</span><span class="cx">
</span><del>- // 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 ) ) {
</del><ins>+ if ( compare( content, postData.content ) && compare( post_title, postData.post_title ) &&
+ compare( excerpt, postData.excerpt ) ) {
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>