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

Consider both home and site domains to be valid in `wp_validate_redirect()`. 

Props layotte.
Fixes #34028.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Campbell 2015-12-06 21:17:24 +00:00
parent 5eae357697
commit 894526c78d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/pluggable.php
View File

@ -1348,6 +1348,7 @@ function wp_validate_redirect($location, $default = '') {
return $default;
$wpp = parse_url(home_url());
$site = parse_url( site_url() );
/**
* Filter the whitelist of hosts to redirect to.
@ -1357,9 +1358,9 @@ function wp_validate_redirect($location, $default = '') {
* @param array $hosts An array of allowed hosts.
* @param bool|string $host The parsed host; empty if not isset.
*/
$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '' );
$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array( $wpp['host'], $site['host'] ), isset( $lp['host'] ) ? $lp['host'] : '' );
if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
if ( isset($lp['host']) && ( ! in_array( $lp['host'], $allowed_hosts ) && ( $lp['host'] != strtolower( $wpp['host'] ) || $lp['host'] != strtolower( $site['host'] ) ) ) )
$location = $default;
return $location;
@ -2480,4 +2481,3 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
return $r;
}
endif;

2
wp-includes/version.php
View File

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