Changeset 35792

Timestamp:

12/06/2015 09:16:12 PM (9 years ago)

Author:

aaroncampbell

Message:

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

Props layotte.
Fixes #34028.

File:

• trunk/src/wp-includes/pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1349 +1349 @@
 
     $wpp = parse_url(home_url());
+    $site = parse_url( site_url() );
 
     /**
@@ -1358 +1359 @@
      * @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'] : '' );
-
-    if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['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'] ) || $lp['host'] != strtolower( $site['host'] ) ) ) )
         $location = $default;
 
@@ -2481 +2482 @@
 }
 endif;
-