<!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>[28430] trunk/src/wp-includes/class-wp-ajax-response.php: Eliminate use of `extract()` in `WP_Ajax_Response::add()`.</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/28430">28430</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 15:24:21 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `WP_Ajax_Response::add()`. Just set most of the properties to variables to avoid interpolation churn.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpajaxresponsephp">trunk/src/wp-includes/class-wp-ajax-response.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpajaxresponsephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-ajax-response.php (28429 => 28430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-ajax-response.php 2014-05-15 06:48:16 UTC (rev 28429)
+++ trunk/src/wp-includes/class-wp-ajax-response.php 2014-05-15 15:24:21 UTC (rev 28430)
</span><span class="lines">@@ -61,33 +61,40 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- extract( $r, EXTR_SKIP );
- $position = preg_replace( '/[^a-z0-9:_-]/i', '', $position );
</del><span class="cx">
</span><del>- if ( is_wp_error($id) ) {
</del><ins>+ $position = preg_replace( '/[^a-z0-9:_-]/i', '', $r['position'] );
+ $id = $r['id'];
+ $what = $r['what'];
+ $action = $r['action'];
+ $old_id = $r['old_id'];
+ $data = $r['data'];
+
+ if ( is_wp_error( $id ) ) {
</ins><span class="cx"> $data = $id;
</span><span class="cx"> $id = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $response = '';
</span><del>- if ( is_wp_error($data) ) {
</del><ins>+ if ( is_wp_error( $data ) ) {
</ins><span class="cx"> foreach ( (array) $data->get_error_codes() as $code ) {
</span><del>- $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message($code) . "]]></wp_error>";
- if ( !$error_data = $data->get_error_data($code) )
</del><ins>+ $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . "]]></wp_error>";
+ if ( ! $error_data = $data->get_error_data( $code ) ) {
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx"> $class = '';
</span><del>- if ( is_object($error_data) ) {
- $class = ' class="' . get_class($error_data) . '"';
- $error_data = get_object_vars($error_data);
</del><ins>+ if ( is_object( $error_data ) ) {
+ $class = ' class="' . get_class( $error_data ) . '"';
+ $error_data = get_object_vars( $error_data );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $response .= "<wp_error_data code='$code'$class>";
</span><span class="cx">
</span><del>- if ( is_scalar($error_data) ) {
</del><ins>+ if ( is_scalar( $error_data ) ) {
</ins><span class="cx"> $response .= "<![CDATA[$error_data]]>";
</span><del>- } elseif ( is_array($error_data) ) {
- foreach ( $error_data as $k => $v )
</del><ins>+ } elseif ( is_array( $error_data ) ) {
+ foreach ( $error_data as $k => $v ) {
</ins><span class="cx"> $response .= "<$k><![CDATA[$v]]></$k>";
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $response .= "</wp_error_data>";
</span><span class="lines">@@ -97,15 +104,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $s = '';
</span><del>- if ( is_array($supplemental) ) {
- foreach ( $supplemental as $k => $v )
</del><ins>+ if ( is_array( $r['supplemental'] ) ) {
+ foreach ( $r['supplemental'] as $k => $v ) {
</ins><span class="cx"> $s .= "<$k><![CDATA[$v]]></$k>";
</span><ins>+ }
</ins><span class="cx"> $s = "<supplemental>$s</supplemental>";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( false === $action )
</del><ins>+ if ( false === $action ) {
</ins><span class="cx"> $action = $_POST['action'];
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $x = '';
</span><span class="cx"> $x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
</span><span class="cx"> $x .= "<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
</span></span></pre>
</div>
</div>
</body>
</html>