Changeset 28430

Timestamp:

05/15/2014 03:24:21 PM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in WP_Ajax_Response::add(). Just set most of the properties to variables to avoid interpolation churn.

See #22400.

File:

• trunk/src/wp-includes/class-wp-ajax-response.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-ajax-response.php

@@ -62 +62 @@
 
                 $r = wp_parse_args( $args, $defaults );
-                extract( $r, EXTR_SKIP );
-                $position = preg_replace( '/[^a-z0-9:_-]/i', '', $position );
 
-                if ( is_wp_error($id) ) {
+                $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 ) ) {
                         $data = $id;
                         $id = 0;
@@ -71 +76 @@
 
                 $response = '';
-                if ( is_wp_error($data) ) {
+                if ( is_wp_error( $data ) ) {
                         foreach ( (array) $data->get_error_codes() as $code ) {
-                                $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message($code) . "]]></wp_error>";
-                                if ( !$error_data = $data->get_error_data($code) )
+                                $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . "]]></wp_error>";
+                                if ( ! $error_data = $data->get_error_data( $code ) ) {
                                         continue;
+                                }
                                 $class = '';
-                                if ( is_object($error_data) ) {
-                                        $class = ' class="' . get_class($error_data) . '"';
-                                        $error_data = get_object_vars($error_data);
+                                if ( is_object( $error_data ) ) {
+                                        $class = ' class="' . get_class( $error_data ) . '"';
+                                        $error_data = get_object_vars( $error_data );
                                 }
 
                                 $response .= "<wp_error_data code='$code'$class>";
 
-                                if ( is_scalar($error_data) ) {
+                                if ( is_scalar( $error_data ) ) {
                                         $response .= "<![CDATA[$error_data]]>";
-                                } elseif ( is_array($error_data) ) {
-                                        foreach ( $error_data as $k => $v )
+                                } elseif ( is_array( $error_data ) ) {
+                                        foreach ( $error_data as $k => $v ) {
                                                 $response .= "<$k><![CDATA[$v]]></$k>";
+                                        }
                                 }
 
@@ -98 +105 @@
 
                 $s = '';
-                if ( is_array($supplemental) ) {
-                        foreach ( $supplemental as $k => $v )
+                if ( is_array( $r['supplemental'] ) ) {
+                        foreach ( $r['supplemental'] as $k => $v ) {
                                 $s .= "<$k><![CDATA[$v]]></$k>";
+                        }
                         $s = "<supplemental>$s</supplemental>";
                 }
 
-                if ( false === $action )
+                if ( false === $action ) {
                         $action = $_POST['action'];
-
+                }
                 $x = '';
                 $x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action