Ticket #34028: 34028.2.diff

wp-includes/pluggable.php

@@ -1347 +1347 @@
         if ( isset($lp['scheme'])  && !isset($lp['host']) )
                 return $default;
 
-        $wpp = parse_url(home_url());
+        $home = parse_url(home_url());
+        $site = parse_url(site_url());
 
         /**
          * Filter the whitelist of hosts to redirect to.
@@ -1357 +1358 @@
          * @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($home['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($home['host']) || $lp['host'] != strtolower($site['host']) ) ) )
                 $location = $default;
 
         return $location;