Changeset 17928 for trunk/wp-includes/functions.php

Timestamp:

05/14/2011 07:45:07 PM (13 years ago)

Author:

nacin

Message:

Use wp_remote_retrieve_* helper functions instead of the raw HTTP response array. props aaroncampbell, fixes #17416.

File:

• trunk/wp-includes/functions.php (modified) (7 diffs)

trunk/wp-includes/functions.php

@@ -601 +601 @@
     wp_protect_special_option( $option );
 
-    /* 
+    /*
      * FIXME the next two lines of code are not necessary and should be removed.
      * @see http://core.trac.wordpress.org/ticket/13480
@@ -1306 +1306 @@
 
     $headers = wp_remote_retrieve_headers( $response );
-    $headers['response'] = $response['response']['code'];
+    $headers['response'] = wp_remote_retrieve_response_code( $response );
 
     // WP_HTTP no longer follows redirects for HEAD requests.
@@ -1321 +1321 @@
         return $headers;
 
-    fwrite( $out_fp,  $response['body']);
+    fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
     fclose($out_fp);
     clearstatcache();
@@ -1557 +1557 @@
         return false;
 
-    return $response['body'];
+    return wp_remote_retrieve_body( $response );
 }
 
@@ -2877 +2877 @@
  * @param string|array $args Optional arguements to control behaviour.
  */
-function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) { 
+function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
     global $wp_xmlrpc_server;
     $defaults = array( 'response' => 500 );
@@ -2883 +2883 @@
     $r = wp_parse_args($args, $defaults);
 
-    if ( $wp_xmlrpc_server ) { 
-        $error = new IXR_Error( $r['response'] , $message); 
-        $wp_xmlrpc_server->output( $error->getXml() ); 
+    if ( $wp_xmlrpc_server ) {
+        $error = new IXR_Error( $r['response'] , $message);
+        $wp_xmlrpc_server->output( $error->getXml() );
     }
     die();
@@ -2892 +2892 @@
 /**
  * Filter to enable special wp_die handler for xmlrpc requests.
- * 
+ *
  * @since 3.2.0
  * @access private
  */
-function _xmlrpc_wp_die_filter() { 
+function _xmlrpc_wp_die_filter() {
     return '_xmlrpc_wp_die_handler';
 }