<!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>[19801] trunk: Re-purpose wp_die() for ajax responses.</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/19801">19801</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-01-31 22:12:58 +0000 (Tue, 31 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-purpose wp_die() for ajax responses.
* Allows unit testing of core ajax actions.
* wp_die() now has separate filters to choose a handler depending on the context (ajax, XML-RPC, else).
* wp_die) in ajax context does not need to be called with a string. Conversion takes place before die().
props kurtpayne, see <a href="http://core.trac.wordpress.org/ticket/15327">#15327</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpajaxresponsephp">trunk/wp-includes/class-wp-ajax-response.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpajaxresponsephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-ajax-response.php (19800 => 19801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-ajax-response.php 2012-01-31 19:59:09 UTC (rev 19800)
+++ trunk/wp-includes/class-wp-ajax-response.php 2012-01-31 22:12:58 UTC (rev 19801)
</span><span class="lines">@@ -131,6 +131,6 @@
</span><span class="cx"> foreach ( (array) $this->responses as $response )
</span><span class="cx"> echo $response;
</span><span class="cx"> echo '</wp_ajax>';
</span><del>- die();
</del><ins>+ wp_die();
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (19800 => 19801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-01-31 19:59:09 UTC (rev 19800)
+++ trunk/wp-includes/functions.php 2012-01-31 22:12:58 UTC (rev 19801)
</span><span class="lines">@@ -2043,16 +2043,14 @@
</span><span class="cx"> * @param string $title Error title.
</span><span class="cx"> * @param string|array $args Optional arguments to control behavior.
</span><span class="cx"> */
</span><del>-function wp_die( $message, $title = '', $args = array() ) {
</del><ins>+function wp_die( $message = '', $title = '', $args = array() ) {
</ins><span class="cx"> if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
</span><del>- die('-1');
</del><ins>+ $function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
+ elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST )
+ $function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
+ else
+ $function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
</ins><span class="cx">
</span><del>- if ( function_exists( 'apply_filters' ) ) {
- $function = apply_filters( 'wp_die_handler', '_default_wp_die_handler');
- } else {
- $function = '_default_wp_die_handler';
- }
-
</del><span class="cx"> call_user_func( $function, $message, $title, $args );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2102,7 +2100,7 @@
</span><span class="cx"> $message .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ) :
</del><ins>+ if ( ! did_action( 'admin_head' ) ) :
</ins><span class="cx"> if ( !headers_sent() ) {
</span><span class="cx"> status_header( $r['response'] );
</span><span class="cx"> nocache_headers();
</span><span class="lines">@@ -2206,7 +2204,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body id="error-page">
</span><del>-<?php endif; // !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ?>
</del><ins>+<?php endif; // ! did_action( 'admin_head' ) ?>
</ins><span class="cx"> <?php echo $message; ?>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="lines">@@ -2240,13 +2238,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Filter to enable special wp_die handler for xmlrpc requests.
</del><ins>+ * Kill WordPress ajax execution.
</ins><span class="cx"> *
</span><del>- * @since 3.2.0
</del><ins>+ * This is the handler for wp_die when processing Ajax requests.
+ *
+ * @since 3.4.0
</ins><span class="cx"> * @access private
</span><ins>+ *
+ * @param string $message Optional. Response to print.
</ins><span class="cx"> */
</span><del>-function _xmlrpc_wp_die_filter() {
- return '_xmlrpc_wp_die_handler';
</del><ins>+function _ajax_wp_die_handler( $message = '' ) {
+ if ( is_scalar( $message ) )
+ die( (string) $message );
+ die( '0' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (19800 => 19801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2012-01-31 19:59:09 UTC (rev 19800)
+++ trunk/wp-includes/pluggable.php 2012-01-31 22:12:58 UTC (rev 19801)
</span><span class="lines">@@ -829,8 +829,12 @@
</span><span class="cx">
</span><span class="cx"> $result = wp_verify_nonce( $nonce, $action );
</span><span class="cx">
</span><del>- if ( $die && false == $result )
- die('-1');
</del><ins>+ if ( $die && false == $result ) {
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+ wp_die( -1 );
+ else
+ die( '-1' );
+ }
</ins><span class="cx">
</span><span class="cx"> do_action('check_ajax_referer', $action, $result);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (19800 => 19801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2012-01-31 19:59:09 UTC (rev 19800)
+++ trunk/xmlrpc.php 2012-01-31 22:12:58 UTC (rev 19801)
</span><span class="lines">@@ -98,9 +98,6 @@
</span><span class="cx"> if ( isset($HTTP_RAW_POST_DATA) )
</span><span class="cx"> logIO("I", $HTTP_RAW_POST_DATA);
</span><span class="cx">
</span><del>-// Make sure wp_die output is XML
-add_filter( 'wp_die_handler', '_xmlrpc_wp_die_filter' );
-
</del><span class="cx"> // Allow for a plugin to insert a different class to handle requests.
</span><span class="cx"> $wp_xmlrpc_server_class = apply_filters('wp_xmlrpc_server_class', 'wp_xmlrpc_server');
</span><span class="cx"> $wp_xmlrpc_server = new $wp_xmlrpc_server_class;
</span></span></pre>
</div>
</div>
</body>
</html>