<!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>[23692] trunk/wp-admin: Logged out warnings, heartbeat: remove nopriv_autosave as it doubles the functionality of the logged out warnings, move wp_ajax_nopriv_heartbeat() under No-privilege Ajax handlers in ajax-actions.php, see #23295, see #23216</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, #logmsg > ol { margin-left: 0; 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/23692">23692</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-03-13 23:54:12 +0000 (Wed, 13 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Logged out warnings, heartbeat: remove nopriv_autosave as it doubles the functionality of the logged out warnings, move wp_ajax_nopriv_heartbeat() under No-privilege Ajax handlers in ajax-actions.php, see <a href="http://core.trac.wordpress.org/ticket/23295">#23295</a>, see <a href="http://core.trac.wordpress.org/ticket/23216">#23216</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (23691 => 23692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2013-03-13 23:32:52 UTC (rev 23691)
+++ trunk/wp-admin/admin-ajax.php 2013-03-13 23:54:12 UTC (rev 23692)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
</span><span class="cx"> add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
</span><span class="cx">
</span><del>-add_action( 'wp_ajax_nopriv_autosave', 'wp_ajax_nopriv_autosave', 1 );
</del><span class="cx"> add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
</span><span class="cx">
</span><span class="cx"> if ( is_user_logged_in() )
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (23691 => 23692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-03-13 23:32:52 UTC (rev 23691)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-03-13 23:54:12 UTC (rev 23692)
</span><span class="lines">@@ -9,20 +9,29 @@
</span><span class="cx"> /*
</span><span class="cx"> * No-privilege Ajax handlers.
</span><span class="cx"> */
</span><ins>+function wp_ajax_nopriv_heartbeat() {
+ $response = array();
</ins><span class="cx">
</span><del>-function wp_ajax_nopriv_autosave() {
- $id = isset( $_POST['post_ID'] ) ? (int) $_POST['post_ID'] : 0;
</del><ins>+ // screen_id is the same as $current_screen->id and the JS global 'pagenow'
+ if ( ! empty($_POST['screenid']) )
+ $screen_id = sanitize_key($_POST['screenid']);
+ else
+ $screen_id = 'site';
</ins><span class="cx">
</span><del>- if ( ! $id )
- wp_die( -1 );
</del><ins>+ if ( ! empty($_POST['data']) ) {
+ $data = wp_unslash( (array) $_POST['data'] );
+ $response = apply_filters( 'heartbeat_nopriv_received', $response, $data, $screen_id );
+ }
</ins><span class="cx">
</span><del>- $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="_blank">Please log in again.</a>'), wp_login_url() );
- $x = new WP_Ajax_Response( array(
- 'what' => 'autosave',
- 'id' => $id,
- 'data' => $message
- ) );
- $x->send();
</del><ins>+ $response = apply_filters( 'heartbeat_nopriv_send', $response, $screen_id );
+
+ // Allow the transport to be replaced with long-polling easily
+ do_action( 'heartbeat_nopriv_tick', $response, $screen_id );
+
+ // send the current time according to the server
+ $response['servertime'] = time();
+
+ wp_send_json($response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -2098,31 +2107,6 @@
</span><span class="cx"> wp_send_json($response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function wp_ajax_nopriv_heartbeat() {
- $response = array();
-
- // screen_id is the same as $current_screen->id and the JS global 'pagenow'
- if ( ! empty($_POST['screenid']) )
- $screen_id = sanitize_key($_POST['screenid']);
- else
- $screen_id = 'site';
-
- if ( ! empty($_POST['data']) ) {
- $data = wp_unslash( (array) $_POST['data'] );
- $response = apply_filters( 'heartbeat_nopriv_received', $response, $data, $screen_id );
- }
-
- $response = apply_filters( 'heartbeat_nopriv_send', $response, $screen_id );
-
- // Allow the transport to be replaced with long-polling easily
- do_action( 'heartbeat_nopriv_tick', $response, $screen_id );
-
- // send the current time acording to the server
- $response['servertime'] = time();
-
- wp_send_json($response);
-}
-
</del><span class="cx"> function wp_ajax_revisions_data() {
</span><span class="cx"> check_ajax_referer( 'revisions-ajax-nonce', 'nonce' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>