Changeset 25114

Timestamp:

08/24/2013 03:10:16 AM (13 years ago)

Author:

SergeyBiryukov

Message:

Avoid a fatal error in WP_Http::request() if $response is a WP_Error instance. props dllh, nacin. fixes #24987.

File:

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

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

@@ -196 +196 @@
                 }
 
-                $response = $this->_dispatch_request($url, $r);
+                $response = $this->_dispatch_request( $url, $r );
+                if ( is_wp_error( $response ) )
+                        return $response;
 
                 // Append cookies that were used in this request to the response
                 if ( ! empty( $r['cookies'] ) ) {
-                $cookies_set = wp_list_pluck( $response['cookies'], 'name' );
-                foreach ( $r['cookies'] as $cookie ) {
-                        if ( ! in_array( $cookie->name, $cookies_set ) && $cookie->test( $url ) ) {
-                                        $response['cookies'][] = $cookie;
-                        }
-                }
+                        $cookies_set = wp_list_pluck( $response['cookies'], 'name' );
+                        foreach ( $r['cookies'] as $cookie ) {
+                                if ( ! in_array( $cookie->name, $cookies_set ) && $cookie->test( $url ) ) {
+                                        $response['cookies'][] = $cookie;
+                                }
+                        }
                 }
 
@@ -654 +656 @@
                 // Include valid cookies in the redirect process
                 if ( ! empty( $response['cookies'] ) ) {
-                foreach ( $response['cookies'] as $cookie ) {
-                        if ( $cookie->test( $redirect_location ) )
-                                $args['cookies'][] = $cookie;
+                        foreach ( $response['cookies'] as $cookie ) {
+                                if ( $cookie->test( $redirect_location ) )
+                                        $args['cookies'][] = $cookie;
                         }
                 }