<!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>[24209] trunk: Post locks and autosave:</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/24209">24209</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-05-08 22:52:55 +0000 (Wed, 08 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Post locks and autosave:
- Move nonces refreshing from autosave to lock checking.
- Do autosave only when there is something to save.
See <a href="http://core.trac.wordpress.org/ticket/23295">#23295</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminjspostjs">trunk/wp-admin/js/post.js</a></li>
<li><a href="#trunkwpincludesjsautosavejs">trunk/wp-includes/js/autosave.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (24208 => 24209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-05-08 22:45:58 UTC (rev 24208)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-05-08 22:52:55 UTC (rev 24209)
</span><span class="lines">@@ -1038,7 +1038,7 @@
</span><span class="cx"> function wp_ajax_autosave() {
</span><span class="cx"> define( 'DOING_AUTOSAVE', true );
</span><span class="cx">
</span><del>- $nonce_age = check_ajax_referer( 'autosave', 'autosavenonce' );
</del><ins>+ check_ajax_referer( 'autosave', 'autosavenonce' );
</ins><span class="cx">
</span><span class="cx"> $_POST['post_category'] = explode(",", $_POST['catslist']);
</span><span class="cx"> if ( $_POST['post_type'] == 'page' || empty($_POST['post_category']) )
</span><span class="lines">@@ -1090,15 +1090,6 @@
</span><span class="cx"> $id = $post->ID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $nonce_age == 2 ) {
- $supplemental['replace-autosavenonce'] = wp_create_nonce('autosave');
- $supplemental['replace-getpermalinknonce'] = wp_create_nonce('getpermalink');
- $supplemental['replace-samplepermalinknonce'] = wp_create_nonce('samplepermalink');
- $supplemental['replace-closedpostboxesnonce'] = wp_create_nonce('closedpostboxes');
- $supplemental['replace-_ajax_linking_nonce'] = wp_create_nonce( 'internal-linking' );
- $supplemental['replace-_wpnonce'] = wp_create_nonce( 'update-post_' . $post->ID );
- }
-
</del><span class="cx"> $x = new WP_Ajax_Response( array(
</span><span class="cx"> 'what' => 'autosave',
</span><span class="cx"> 'id' => $id,
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (24208 => 24209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2013-05-08 22:45:58 UTC (rev 24208)
+++ trunk/wp-admin/includes/misc.php 2013-05-08 22:52:55 UTC (rev 24209)
</span><span class="lines">@@ -623,6 +623,17 @@
</span><span class="cx"> $send['new_lock'] = implode( ':', $new_lock );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! empty( $received['post_nonce'] ) && 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) {
+ $send['update_nonces'] = array(
+ 'replace-autosavenonce' => wp_create_nonce('autosave'),
+ 'replace-getpermalinknonce' => wp_create_nonce('getpermalink'),
+ 'replace-samplepermalinknonce' => wp_create_nonce('samplepermalink'),
+ 'replace-closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
+ 'replace-_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
+ 'replace-_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+ );
+ }
+
</ins><span class="cx"> $response['wp-refresh-post-lock'] = $send;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post.js (24208 => 24209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post.js 2013-05-08 22:45:58 UTC (rev 24208)
+++ trunk/wp-admin/js/post.js 2013-05-08 22:52:55 UTC (rev 24209)
</span><span class="lines">@@ -252,7 +252,10 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> $(document).on( 'heartbeat-send.refresh-lock', function( e, data ) {
</span><del>- var lock = $('#active_post_lock').val(), post_id = $('#post_ID').val(), send = {};
</del><ins>+ var lock = $('#active_post_lock').val(),
+ post_id = $('#post_ID').val(),
+ post_nonce = $('#_wpnonce').val(),
+ send = {};
</ins><span class="cx">
</span><span class="cx"> if ( !post_id )
</span><span class="cx"> return;
</span><span class="lines">@@ -262,6 +265,9 @@
</span><span class="cx"> if ( lock )
</span><span class="cx"> send['lock'] = lock;
</span><span class="cx">
</span><ins>+ if ( post_nonce )
+ send['post_nonce'] = post_nonce;
+
</ins><span class="cx"> data['wp-refresh-post-lock'] = send;
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -286,7 +292,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Save the latest changes and disable
</span><del>- autosave();
</del><ins>+ if ( ! autosave() )
+ window.onbeforeunload = null;
+
</ins><span class="cx"> autosave = function(){};
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -301,6 +309,13 @@
</span><span class="cx"> } else if ( received.new_lock ) {
</span><span class="cx"> $('#active_post_lock').val( received.new_lock );
</span><span class="cx"> }
</span><ins>+
+ if ( received.update_nonces ) {
+ $.each( received.update_nonces, function( selector, value ) {
+ if ( selector.match(/^replace-/) )
+ $( '#' + selector.replace('replace-', '') ).val( value );
+ });
+ }
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.js (24208 => 24209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.js 2013-05-08 22:45:58 UTC (rev 24208)
+++ trunk/wp-includes/js/autosave.js 2013-05-08 22:52:55 UTC (rev 24209)
</span><span class="lines">@@ -254,20 +254,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> autosave = function() {
</span><del>- // (bool) is rich editor enabled and active
</del><ins>+ var post_data = wp.autosave.getPostData(),
+ doAutoSave = post_data.autosave,
+ successCallback;
+
</ins><span class="cx"> blockSave = true;
</span><del>- var rich = (typeof tinymce != "undefined") && tinymce.activeEditor && !tinymce.activeEditor.isHidden(),
- post_data, doAutoSave, ed, origStatus, successCallback;
</del><span class="cx">
</span><del>- // Disable buttons until we know the save completed.
- autosave_disable_buttons();
-
- post_data = wp.autosave.getPostData();
-
- // We always send the ajax request in order to keep the post lock fresh.
- // This (bool) tells whether or not to write the post to the DB during the ajax request.
- doAutoSave = post_data.autosave;
-
</del><span class="cx"> // No autosave while thickbox is open (media buttons)
</span><span class="cx"> if ( jQuery("#TB_window").css('display') == 'block' )
</span><span class="cx"> doAutoSave = false;
</span><span class="lines">@@ -281,9 +273,12 @@
</span><span class="cx"> autosaveLast = post_data["post_title"] + post_data["content"];
</span><span class="cx"> jQuery(document).triggerHandler('wpcountwords', [ post_data["content"] ]);
</span><span class="cx"> } else {
</span><del>- post_data['autosave'] = 0;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Disable buttons until we know the save completed.
+ autosave_disable_buttons();
+
</ins><span class="cx"> if ( post_data["auto_draft"] == '1' ) {
</span><span class="cx"> successCallback = autosave_saved_new; // new post
</span><span class="cx"> } else {
</span><span class="lines">@@ -297,6 +292,8 @@
</span><span class="cx"> url: ajaxurl,
</span><span class="cx"> success: successCallback
</span><span class="cx"> });
</span><ins>+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Autosave in localStorage
</span></span></pre>
</div>
</div>
</body>
</html>