<!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>[20063] trunk: New wp_die_app_handler context in wp_die() for APP requests.</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/20063">20063</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-01 21:35:15 +0000 (Thu, 01 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>New wp_die_app_handler context in wp_die() for APP requests. Introduces _scalar_wp_die_handler() as a generic handler that wraps die(), for use by plugins. Move deprecated function to the end of the wp-app.php file (same as xmlrpc.php). see <a href="http://core.trac.wordpress.org/ticket/20042">#20042</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesclasswpatomserverphp">trunk/wp-includes/class-wp-atom-server.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (20062 => 20063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2012-03-01 21:15:44 UTC (rev 20062)
+++ trunk/wp-app.php 2012-03-01 21:35:15 UTC (rev 20063)
</span><span class="lines">@@ -26,6 +26,15 @@
</span><span class="cx">
</span><span class="cx"> $_SERVER['PATH_INFO'] = preg_replace( '/.*\/wp-app\.php/', '', $_SERVER['REQUEST_URI'] );
</span><span class="cx">
</span><ins>+// Allow for a plugin to insert a different class to handle requests.
+$wp_atom_server_class = apply_filters('wp_atom_server_class', 'wp_atom_server');
+$wp_atom_server = new $wp_atom_server_class;
+
+// Handle the request
+$wp_atom_server->handle_request();
+
+exit;
+
</ins><span class="cx"> /**
</span><span class="cx"> * Writes logging info to a file.
</span><span class="cx"> *
</span><span class="lines">@@ -42,10 +51,3 @@
</span><span class="cx"> if ( ! empty( $GLOBALS['app_logging'] ) )
</span><span class="cx"> error_log( $label . ' - ' . $message );
</span><span class="cx"> }
</span><del>-
-// Allow for a plugin to insert a different class to handle requests.
-$wp_atom_server_class = apply_filters('wp_atom_server_class', 'wp_atom_server');
-$wp_atom_server = new $wp_atom_server_class;
-
-// Handle the request
-$wp_atom_server->handle_request();
</del></span></pre></div>
<a id="trunkwpincludesclasswpatomserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-atom-server.php (20062 => 20063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-atom-server.php 2012-03-01 21:15:44 UTC (rev 20062)
+++ trunk/wp-includes/class-wp-atom-server.php 2012-03-01 21:35:15 UTC (rev 20063)
</span><span class="lines">@@ -175,30 +175,9 @@
</span><span class="cx"> 'PUT' => 'put_attachment',
</span><span class="cx"> 'DELETE' => 'delete_attachment'),
</span><span class="cx"> );
</span><del>-
- add_filter( 'wp_die_handler', array( $this, 'return_atom_die_handler' ) );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Override die handler
- * @return callback
- */
- public function return_atom_die_handler() {
- return array( $this, 'atom_die_handler' );
- }
-
- /**
- * Die with a message. Only accept strings, no WP_Error objects yet
- * @param string $message
- * @return void
- */
- public function atom_die_handler( $message ) {
- if ( is_scalar( $message ) )
- die( (string) $message );
- die();
- }
-
- /**
</del><span class="cx"> * Handle ATOMPUB request.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.2.0
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (20062 => 20063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-03-01 21:15:44 UTC (rev 20062)
+++ trunk/wp-includes/functions.php 2012-03-01 21:35:15 UTC (rev 20063)
</span><span class="lines">@@ -1976,6 +1976,8 @@
</span><span class="cx"> $function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
</span><span class="cx"> elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST )
</span><span class="cx"> $function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
</span><ins>+ elseif ( defined( 'APP_REQUEST' ) && APP_REQUEST )
+ $function = apply_filters( 'wp_die_app_bandler', '_scalar_wp_die_handler' );
</ins><span class="cx"> else
</span><span class="cx"> $function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
</span><span class="cx">
</span><span class="lines">@@ -2182,6 +2184,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Kill WordPress execution.
+ *
+ * This is the handler for wp_die when processing APP requests.
+ *
+ * @since 3.4.0
+ * @access private
+ *
+ * @param string $message Optional. Response to print.
+ */
+function _scalar_wp_die_handler( $message = '' ) {
+ if ( is_scalar( $message ) )
+ die( (string) $message );
+ die();
+}
+
+/**
</ins><span class="cx"> * Retrieve the WordPress home page URL.
</span><span class="cx"> *
</span><span class="cx"> * If the constant named 'WP_HOME' exists, then it will be used and returned by
</span></span></pre>
</div>
</div>
</body>
</html>