Changeset 37989 for trunk/src/wp-includes/class-http.php

Timestamp:

07/06/2016 05:50:44 PM (8 years ago)

Author:

rmccue

Message:

HTTP API: Switch back to returning an array.

The array-compatibility object we started returning in r37428 unfortunately isn't enough like an array. In particular, is_array() checks fail, despite the object implementing ArrayAccess. Mea culpa.

This moves the WP_HTTP_Response object to a new http_response key in the array, and changes the value back to an actual array.

Fixes #37097.
See #33055.

File:

• trunk/src/wp-includes/class-http.php (modified) (2 diffs)

trunk/src/wp-includes/class-http.php

@@ -349 +349 @@
 
         try {
-            $response = Requests::request( $url, $headers, $data, $type, $options );
+            $requests_response = Requests::request( $url, $headers, $data, $type, $options );
 
             // Convert the response into an array
-            $response = new WP_HTTP_Requests_Response( $response, $r['filename'] );
+            $http_response = new WP_HTTP_Requests_Response( $requests_response, $r['filename'] );
+            $response = $http_response->to_array();
+
+            // Add the original object to the array.
+            $response['http_response'] = $http_response;
         }
         catch ( Requests_Exception $e ) {
@@ -383 +387 @@
                 ),
                 'cookies' => array(),
+                'http_response' => null,
             );
         }