Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 17916) +++ wp-admin/includes/dashboard.php (working copy) @@ -1208,10 +1208,10 @@ 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ); - $raw_response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.0/', $options ); + $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.0/', $options ); - if ( is_wp_error( $raw_response ) || 200 != $raw_response['response']['code'] ) - return; + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) + return false; /** * Response should be an array with: @@ -1224,7 +1224,7 @@ * 'img_src' - string - An image representing the browser * 'img_src_ssl' - string - An image (over SSL) representing the browser */ - $response = unserialize( $raw_response['body'] ); + $response = unserialize( wp_remote_retrieve_body( $response ) ); if ( ! $response ) return; Index: wp-admin/includes/file.php =================================================================== --- wp-admin/includes/file.php (revision 17916) +++ wp-admin/includes/file.php (working copy) @@ -490,9 +490,9 @@ return $response; } - if ( $response['response']['code'] != '200' ){ + if ( 200 != wp_remote_retrieve_response_code( $response ) ){ unlink( $tmpfname ); - return new WP_Error( 'http_404', trim( $response['response']['message'] ) ); + return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) ); } return $tmpfname; Index: wp-admin/includes/plugin-install.php =================================================================== --- wp-admin/includes/plugin-install.php (revision 17916) +++ wp-admin/includes/plugin-install.php (working copy) @@ -45,9 +45,9 @@ if ( is_wp_error($request) ) { $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() ); } else { - $res = unserialize($request['body']); + $res = unserialize( wp_remote_retrieve_body( $request ) ); if ( false === $res ) - $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), $request['body']); + $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) ); } } elseif ( !is_wp_error($res) ) { $res->external = true; @@ -367,4 +367,3 @@ exit; } add_action('install_plugins_pre_plugin-information', 'install_plugin_information'); - Index: wp-admin/includes/schema.php =================================================================== --- wp-admin/includes/schema.php (revision 17916) +++ wp-admin/includes/schema.php (working copy) @@ -762,7 +762,7 @@ $page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) ); if ( is_wp_error( $page ) ) $errstr = $page->get_error_message(); - elseif ( 200 == $page['response']['code'] ) + elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) $vhost_ok = true; if ( ! $vhost_ok ) { Index: wp-admin/includes/theme.php =================================================================== --- wp-admin/includes/theme.php (revision 17916) +++ wp-admin/includes/theme.php (working copy) @@ -396,9 +396,9 @@ if ( is_wp_error($request) ) { $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() ); } else { - $res = unserialize($request['body']); + $res = unserialize( wp_remote_retrieve_body( $request ) ); if ( ! $res ) - $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), $request['body']); + $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) ); } } //var_dump(array($args, $res)); Index: wp-includes/class-feed.php =================================================================== --- wp-includes/class-feed.php (revision 17916) +++ wp-includes/class-feed.php (working copy) @@ -80,9 +80,9 @@ $this->error = 'WP HTTP Error: ' . $res->get_error_message(); $this->success = false; } else { - $this->headers = $res['headers']; - $this->body = $res['body']; - $this->status_code = $res['response']['code']; + $this->headers = wp_remote_retrieve_headers( $res ); + $this->body = wp_remote_retrieve_body( $res ); + $this->status_code = wp_remote_retrieve_response_code( $res ); } } else { if ( ! $this->body = file_get_contents($url) ) { @@ -91,4 +91,4 @@ } } } -} \ No newline at end of file +} Index: wp-includes/class-wp-http-ixr-client.php =================================================================== --- wp-includes/class-wp-http-ixr-client.php (revision 17916) +++ wp-includes/class-wp-http-ixr-client.php (working copy) @@ -64,16 +64,16 @@ return false; } - if ( $response['response']['code'] != 200 ) { - $this->error = new IXR_Error(-32301, "transport error - HTTP status code was not 200 ({$response['response']['code']})"); + if ( 200 != wp_remote_retrieve_response_code( $response ) ) { + $this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')'); return false; } if ( $this->debug ) - echo '
' . htmlspecialchars($response['body']) . "\n
\n\n"; + echo '
' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n
\n\n"; // Now parse what we've got back - $this->message = new IXR_Message( $response['body'] ); + $this->message = new IXR_Message( wp_remote_retrieve_body( $response ) ); if ( ! $this->message->parse() ) { // XML error $this->error = new IXR_Error(-32700, 'parse error. not well formed'); @@ -90,4 +90,4 @@ return true; } } -?> \ No newline at end of file +?> Index: wp-includes/comment.php =================================================================== --- wp-includes/comment.php (revision 17916) +++ wp-includes/comment.php (working copy) @@ -1619,11 +1619,11 @@ if ( is_wp_error( $response ) ) return false; - if ( isset( $response['headers']['x-pingback'] ) ) - return $response['headers']['x-pingback']; + if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) + return wp_remote_retrieve_header( $response, 'x-pingback' ); // Not an (x)html, sgml, or xml page, no use going further. - if ( isset( $response['headers']['content-type'] ) && preg_match('#(image|audio|video|model)/#is', $response['headers']['content-type']) ) + if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) ) return false; // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file) @@ -1632,7 +1632,7 @@ if ( is_wp_error( $response ) ) return false; - $contents = $response['body']; + $contents = wp_remote_retrieve_body( $response ); $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote); $pingback_link_offset_squote = strpos($contents, $pingback_str_squote); Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 17916) +++ wp-includes/functions.php (working copy) @@ -600,7 +600,7 @@ 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 */ @@ -1305,7 +1305,7 @@ return false; $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. if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) { @@ -1320,7 +1320,7 @@ if ( !$out_fp ) return $headers; - fwrite( $out_fp, $response['body']); + fwrite( $out_fp, wp_remote_retrieve_body( $response ) ); fclose($out_fp); clearstatcache(); @@ -1556,7 +1556,7 @@ if ( is_wp_error( $response ) ) return false; - return $response['body']; + return wp_remote_retrieve_body( $response ); } /** @@ -2876,26 +2876,26 @@ * @param string $title Error title. * @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 ); $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(); } /** * 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'; } Index: wp-includes/rss.php =================================================================== --- wp-includes/rss.php (revision 17916) +++ wp-includes/rss.php (working copy) @@ -555,7 +555,7 @@ // Snoopy returns headers unprocessed. // Also note, WP_HTTP lowercases all keys, Snoopy did not. $return_headers = array(); - foreach ( $resp['headers'] as $key => $value ) { + foreach ( wp_remote_retrieve_headers( $resp ) as $key => $value ) { if ( !is_array($value) ) { $return_headers[] = "$key: $value"; } else { @@ -565,10 +565,10 @@ } $response = new stdClass; - $response->status = $resp['response']['code']; - $response->response_code = $resp['response']['code']; + $response->status = wp_remote_retrieve_response_code( $resp ); + $response->response_code = wp_remote_retrieve_response_code( $resp ); $response->headers = $return_headers; - $response->results = $resp['body']; + $response->results = wp_remote_retrieve_body( $resp ); return $response; } Index: wp-includes/update.php =================================================================== --- wp-includes/update.php (revision 17916) +++ wp-includes/update.php (working copy) @@ -71,13 +71,10 @@ $response = wp_remote_get($url, $options); - if ( is_wp_error( $response ) ) + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) return false; - if ( 200 != $response['response']['code'] ) - return false; - - $body = trim( $response['body'] ); + $body = trim( wp_remote_retrieve_body( $response ) ); $body = str_replace(array("\r\n", "\r"), "\n", $body); $new_options = array(); foreach ( explode( "\n\n", $body ) as $entry ) { @@ -175,14 +172,11 @@ $raw_response = wp_remote_post('http://api.wordpress.org/plugins/update-check/1.0/', $options); - if ( is_wp_error( $raw_response ) ) + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) return false; - if ( 200 != $raw_response['response']['code'] ) - return false; + $response = unserialize( wp_remote_retrieve_body( $raw_response ) ); - $response = unserialize( $raw_response['body'] ); - if ( false !== $response ) $new_option->response = $response; else @@ -273,17 +267,14 @@ $raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options ); - if ( is_wp_error( $raw_response ) ) + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) return false; - if ( 200 != $raw_response['response']['code'] ) - return false; - $new_update = new stdClass; $new_update->last_checked = time( ); $new_update->checked = $checked; - $response = unserialize( $raw_response['body'] ); + $response = unserialize( wp_remote_retrieve_body( $raw_response ) ); if ( false !== $response ) $new_update->response = $response;