Ticket #8591: 8591a.diff

wp-includes/comment.php

@@ -1261 +1261 @@
 
         $contents = $response['body'];
 
+        if ( is_wp_error( $contents ) )
+                return false;
+
         $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
         $pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
         if ( $pingback_link_offset_dquote || $pingback_link_offset_squote ) {

wp-includes/functions.php

@@ -1276 +1276 @@
 
         $response = wp_remote_get( $uri, $options );
 
-        if ( is_wp_error( $response ) )
+        if ( is_wp_error( $response ) || is_wp_error( $response['body'] ) )
                 return false;
 
         return $response['body'];

wp-admin/update-links.php

@@ -41 +41 @@
 if ( is_wp_error( $response ) )
         wp_die(__('Request Failed.'));
 
-if ( $response['response']['code'] != 200 )
+if ( $response['response']['code'] != 200 || is_wp_error( $response['body'] ) )
         wp_die(__('Request Failed.'));
 
 $body = str_replace(array("\r\n", "\r"), "\n", $response['body']);

wp-admin/includes/plugin-install.php

@@ -39 +39 @@
 
         if ( ! $res ) {
                 $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
-                if ( is_wp_error($request) ) {
+                if ( is_wp_error($request) || is_wp_error($request['body']) ) {
                         $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occured during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
                 } else {
                         $res = unserialize($request['body']);

wp-admin/includes/file.php

@@ -443 +443 @@
 
         $response = wp_remote_get($url, array('timeout' => 30));
 
-        if ( is_wp_error($response) ) {
+        if ( is_wp_error($response) || ( isset( $response['body'] ) && is_wp_error( $response['body'] ) ) ) {
                 fclose($handle);
                 unlink($tmpfname);
                 return $response;