Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-24 21:32:51 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Improve the summary and description for the pre_http_request filter docs to better illustrate expected values.

Browse Source 
The filter explicitly expects one of three passed value types:

*  An array containing 'headers', 'body', 'response', 'cookies', and 'filename' elements
*  A `WP_Error` instance
*  Boolean false (to avoid short-circuiting the response)

Props johnbillion.
Fixes #33995.

Built from https://develop.svn.wordpress.org/trunk@34509


git-svn-id: http://core.svn.wordpress.org/trunk@34473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-09-24 18:52:25 +00:00
parent 6fdd384fe0
commit 4c7a4bfb25
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/class-http.php
View File

@ -159,18 +159,25 @@ class WP_Http {
$r['_redirection'] = $r['redirection']; $r['_redirection'] = $r['redirection'];
/** /**
* Filter whether to preempt an HTTP request's return. * Filter whether to preempt an HTTP request's return value.
* *
* Returning a truthy value to the filter will short-circuit * Returning a non-false value from the filter will short-circuit the HTTP request and return
* the HTTP request and return early with that value. * early with that value. A filter should return either:
*
* - An array containing 'headers', 'body', 'response', 'cookies', and 'filename' elements
* - A WP_Error instance
* - boolean false (to avoid short-circuiting the response)
*
* Returning any other value may result in unexpected behaviour.
* *
* @since 2.9.0 * @since 2.9.0
* *
* @param bool $preempt Whether to preempt an HTTP request return. Default false. * @param false|array|WP_Error $preempt Whether to preempt an HTTP request's return value. Default false.
* @param array $r HTTP request arguments. * @param array $r HTTP request arguments.
* @param string $url The request URL. * @param string $url The request URL.
*/ */
$pre = apply_filters( 'pre_http_request', false, $r, $url ); $pre = apply_filters( 'pre_http_request', false, $r, $url );
if ( false !== $pre ) if ( false !== $pre )
return $pre; return $pre;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34508'; $wp_version = '4.4-alpha-34509';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.