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

Timestamp:

05/14/2011 07:45:07 PM (14 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/update.php (modified) (4 diffs)

trunk/wp-includes/update.php

@@ -72 +72 @@
     $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 +173 @@
     $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 +268 @@
     $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 +275 @@
     $new_update->checked = $checked;
 
-    $response = unserialize( $raw_response['body'] );
+    $response = unserialize( wp_remote_retrieve_body( $raw_response ) );
     if ( false !== $response )
         $new_update->response = $response;