diff --git a/wp-includes/class-requests.php b/wp-includes/class-requests.php index f5aced060a..5efdca8d1f 100644 --- a/wp-includes/class-requests.php +++ b/wp-includes/class-requests.php @@ -323,7 +323,7 @@ public static function patch($url, $headers, $data = array(), $options = array() * for Basic authentication * (Requests_Auth|array|boolean, default: false) * - `proxy`: Proxy details to use for proxy by-passing and authentication - * (Requests_Proxy|array|boolean, default: false) + * (Requests_Proxy|array|string|boolean, default: false) * - `max_bytes`: Limit for the response body size. * (integer|boolean, default: false) * - `idn`: Enable IDN parsing @@ -575,7 +575,7 @@ protected static function set_defaults(&$url, &$headers, &$data, &$type, &$optio $options['auth']->register($options['hooks']); } - if (!empty($options['proxy'])) { + if (is_string($options['proxy']) || is_array($options['proxy'])) { $options['proxy'] = new Requests_Proxy_HTTP($options['proxy']); } if ($options['proxy'] !== false) { diff --git a/wp-includes/version.php b/wp-includes/version.php index af3348fd3b..3ffda2fb2c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta2-38052'; +$wp_version = '4.6-beta2-38053'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.