Index: /trunk/wp-admin/includes/dashboard.php =================================================================== --- /trunk/wp-admin/includes/dashboard.php (revision 17927) +++ /trunk/wp-admin/includes/dashboard.php (revision 17928) @@ -1209,8 +1209,8 @@ ); - $raw_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; + $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.0/', $options ); + + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) + return false; /** @@ -1225,5 +1225,5 @@ * '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 ) Index: /trunk/wp-admin/includes/file.php =================================================================== --- /trunk/wp-admin/includes/file.php (revision 17927) +++ /trunk/wp-admin/includes/file.php (revision 17928) @@ -491,7 +491,7 @@ } - 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 ) ) ); } Index: /trunk/wp-admin/includes/plugin-install.php =================================================================== --- /trunk/wp-admin/includes/plugin-install.php (revision 17927) +++ /trunk/wp-admin/includes/plugin-install.php (revision 17928) @@ -46,7 +46,7 @@ $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) ) { @@ -368,3 +368,2 @@ } add_action('install_plugins_pre_plugin-information', 'install_plugin_information'); - Index: /trunk/wp-admin/includes/schema.php =================================================================== --- /trunk/wp-admin/includes/schema.php (revision 17927) +++ /trunk/wp-admin/includes/schema.php (revision 17928) @@ -763,5 +763,5 @@ 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; Index: /trunk/wp-admin/includes/theme.php =================================================================== --- /trunk/wp-admin/includes/theme.php (revision 17927) +++ /trunk/wp-admin/includes/theme.php (revision 17928) @@ -397,7 +397,7 @@ $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 ) ); } } Index: /trunk/wp-includes/class-feed.php =================================================================== --- /trunk/wp-includes/class-feed.php (revision 17927) +++ /trunk/wp-includes/class-feed.php (revision 17928) @@ -81,7 +81,7 @@ $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 { Index: /trunk/wp-includes/class-wp-http-ixr-client.php =================================================================== --- /trunk/wp-includes/class-wp-http-ixr-client.php (revision 17927) +++ /trunk/wp-includes/class-wp-http-ixr-client.php (revision 17928) @@ -65,14 +65,14 @@ } - 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 Index: /trunk/wp-includes/comment.php =================================================================== --- /trunk/wp-includes/comment.php (revision 17927) +++ /trunk/wp-includes/comment.php (revision 17928) @@ -1620,9 +1620,9 @@ 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; @@ -1633,5 +1633,5 @@ return false; - $contents = $response['body']; + $contents = wp_remote_retrieve_body( $response ); $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote); Index: /trunk/wp-includes/functions.php =================================================================== --- /trunk/wp-includes/functions.php (revision 17927) +++ /trunk/wp-includes/functions.php (revision 17928) @@ -601,5 +601,5 @@ 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,5 +1306,5 @@ $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,5 +1321,5 @@ return $headers; - fwrite( $out_fp, $response['body']); + fwrite( $out_fp, wp_remote_retrieve_body( $response ) ); fclose($out_fp); clearstatcache(); @@ -1557,5 +1557,5 @@ return false; - return $response['body']; + return wp_remote_retrieve_body( $response ); } @@ -2877,5 +2877,5 @@ * @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,7 +2883,7 @@ $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,9 +2892,9 @@ /** * 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: /trunk/wp-includes/rss.php =================================================================== --- /trunk/wp-includes/rss.php (revision 17927) +++ /trunk/wp-includes/rss.php (revision 17928) @@ -556,5 +556,5 @@ // 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"; @@ -566,8 +566,8 @@ $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: /trunk/wp-includes/update.php =================================================================== --- /trunk/wp-includes/update.php (revision 17927) +++ /trunk/wp-includes/update.php (revision 17928) @@ -72,11 +72,8 @@ $response = wp_remote_get($url, $options); - if ( is_wp_error( $response ) ) - return false; - - if ( 200 != $response['response']['code'] ) - return false; - - $body = trim( $response['body'] ); + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) + return false; + + $body = trim( wp_remote_retrieve_body( $response ) ); $body = str_replace(array("\r\n", "\r"), "\n", $body); $new_options = array(); @@ -176,11 +173,8 @@ $raw_response = wp_remote_post('http://api.wordpress.org/plugins/update-check/1.0/', $options); - if ( is_wp_error( $raw_response ) ) - return false; - - if ( 200 != $raw_response['response']['code'] ) - return false; - - $response = unserialize( $raw_response['body'] ); + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) + return false; + + $response = unserialize( wp_remote_retrieve_body( $raw_response ) ); if ( false !== $response ) @@ -274,8 +268,5 @@ $raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options ); - if ( is_wp_error( $raw_response ) ) - return false; - - if ( 200 != $raw_response['response']['code'] ) + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) return false; @@ -284,5 +275,5 @@ $new_update->checked = $checked; - $response = unserialize( $raw_response['body'] ); + $response = unserialize( wp_remote_retrieve_body( $raw_response ) ); if ( false !== $response ) $new_update->response = $response;