WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Canonical: Add `$x_redirect_by` parameter to `wp_safe_redirect()`. 

See [42633] and [42408].

Fixes #42313.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2018-02-04 16:05:32 +00:00
parent f3ca5b5f47
commit a1eb261cd1
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/pluggable.php
View File

@ -1186,6 +1186,7 @@ if ( ! function_exists( 'wp_redirect' ) ) :
* } * }
* *
* @since 1.5.1 * @since 1.5.1
* @since 5.0.0 The `$x_redirect_by` parameter was added.
* *
* @global bool $is_IIS * @global bool $is_IIS
* *
@ -1323,13 +1324,14 @@ if ( ! function_exists( 'wp_safe_redirect' ) ) :
* } * }
* *
* @since 2.3.0 * @since 2.3.0
* @since 5.0.0 The return value from wp_redirect() is now passed on. * @since 5.0.0 The return value from wp_redirect() is now passed on, and the `$x_redirect_by` parameter was added.
* *
* @param string $location The path or URL to redirect to. * @param string $location The path or URL to redirect to.
* @param int $status Optional. HTTP response status code to use. Default '302' (Moved Temporarily). * @param int $status Optional. HTTP response status code to use. Default '302' (Moved Temporarily).
* @return bool $redirect False if the redirect was cancelled, true otherwise. * @param string $x_redirect_by Optional. The application doing the redirect. Default 'WordPress'.
* @return bool $redirect False if the redirect was cancelled, true otherwise.
*/ */
function wp_safe_redirect( $location, $status = 302 ) { function wp_safe_redirect( $location, $status = 302, $x_redirect_by = 'WordPress' ) {
// Need to look at the URL the way it will end up in wp_redirect() // Need to look at the URL the way it will end up in wp_redirect()
$location = wp_sanitize_redirect( $location ); $location = wp_sanitize_redirect( $location );
@ -1344,7 +1346,7 @@ if ( ! function_exists( 'wp_safe_redirect' ) ) :
*/ */
$location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) ); $location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) );
return wp_redirect( $location, $status ); return wp_redirect( $location, $status, $x_redirect_by );
} }
endif; endif;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0-alpha-42646'; $wp_version = '5.0-alpha-42647';
/** /**
* 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.