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

General: Pass on the return value from `wp_redirect()` for `wp_safe_redirect()`. 

This brings the behaviour of the two functions in line with each other.

Props Drivingralle

Fixes 42108

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


git-svn-id: http://core.svn.wordpress.org/trunk@42035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-11-20 20:24:48 +00:00
parent 71bdb1635b
commit bb5621a084
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/pluggable.php
View File

@ -1285,10 +1285,19 @@ if ( !function_exists('wp_safe_redirect') ) :
* wp_safe_redirect( $url ); * wp_safe_redirect( $url );
* exit; * exit;
* *
* Exiting can also be selectively manipulated by using wp_safe_redirect() as a conditional
* in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} filters:
*
* if ( wp_safe_redirect( $url ) ) {
* exit;
* }
*
* @since 2.3.0 * @since 2.3.0
* @since 5.0.0 The return value from wp_redirect() is now passed on.
* *
* @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.
*/ */
function wp_safe_redirect($location, $status = 302) { function wp_safe_redirect($location, $status = 302) {
@ -1305,7 +1314,7 @@ function wp_safe_redirect($location, $status = 302) {
*/ */
$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 ) );
wp_redirect($location, $status); return wp_redirect( $location, $status );
} }
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-42205'; $wp_version = '5.0-alpha-42206';
/** /**
* 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.