<!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>[24818] trunk: Add "experimental" to heartbeat phpdoc, fixes #24855 for trunk.</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/24818">24818</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-07-28 20:54:48 +0000 (Sun, 28 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add "experimental" to heartbeat phpdoc, fixes <a href="http://core.trac.wordpress.org/ticket/24855">#24855</a> for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpincludesjsheartbeatjs">trunk/wp-includes/js/heartbeat.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 (24817 => 24818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-07-28 20:48:09 UTC (rev 24817)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-07-28 20:54:48 UTC (rev 24818)
</span><span class="lines">@@ -9,6 +9,12 @@
</span><span class="cx"> /*
</span><span class="cx"> * No-privilege Ajax handlers.
</span><span class="cx"> */
</span><ins>+
+/**
+ * Heartbeat API (experimental)
+ *
+ * Runs when the user is not logged in.
+ */
</ins><span class="cx"> function wp_ajax_nopriv_heartbeat() {
</span><span class="cx"> $response = array();
</span><span class="cx">
</span><span class="lines">@@ -2052,6 +2058,11 @@
</span><span class="cx"> wp_send_json_success( $html );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Heartbeat API (experimental)
+ *
+ * Runs when the user is logged in.
+ */
</ins><span class="cx"> function wp_ajax_heartbeat() {
</span><span class="cx"> if ( empty( $_POST['_nonce'] ) )
</span><span class="cx"> wp_send_json_error();
</span><span class="lines">@@ -2072,9 +2083,6 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty($_POST['data']) ) {
</span><span class="cx"> $data = (array) $_POST['data'];
</span><del>-
- // todo: separate filters: 'heartbeat_[action]' so we call different callbacks only when there is data for them,
- // or all callbacks listen to one filter and run when there is something for them in $data?
</del><span class="cx"> $response = apply_filters( 'heartbeat_received', $response, $data, $screen_id );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsheartbeatjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/heartbeat.js (24817 => 24818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/heartbeat.js 2013-07-28 20:48:09 UTC (rev 24817)
+++ trunk/wp-includes/js/heartbeat.js 2013-07-28 20:54:48 UTC (rev 24818)
</span><span class="lines">@@ -1,6 +1,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Heartbeat API
</span><span class="cx"> *
</span><ins>+ * Note: this API is "experimental" meaning it will likely change a lot
+ * in the next few releases based on feedback from 3.6.0. If you intend
+ * to use it, please follow the development closely.
+ *
</ins><span class="cx"> * Heartbeat is a simple server polling API that sends XHR requests to
</span><span class="cx"> * the server every 15 seconds and triggers events (or callbacks) upon
</span><span class="cx"> * receiving data. Currently these 'ticks' handle transports for post locking,
</span><span class="lines">@@ -47,7 +51,6 @@
</span><span class="cx"> * Returns a boolean that's indicative of whether or not there is a connection error
</span><span class="cx"> *
</span><span class="cx"> * @returns boolean
</span><del>- * @private
</del><span class="cx"> */
</span><span class="cx"> this.hasConnectionError = function() {
</span><span class="cx"> return hasConnectionError;
</span></span></pre>
</div>
</div>
</body>
</html>