diff options
| author | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 06:49:48 +0000 |
|---|---|---|
| committer | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 06:49:48 +0000 |
| commit | d636bee4c01bd393a2b210fb3dd2761d4b76888d (patch) | |
| tree | 9523794871890dea03691062b63277334c32e266 | |
| parent | ac6762ce382a6e6f1c8d104b243c8e48cab2b47e (diff) | |
| parent | 3d723ed1ed0755a4ad30e1d3388d663f53193295 (diff) | |
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
| -rw-r--r-- | classes/Status_network.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php index dce3e0b8f..1f0e602cf 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -158,8 +158,9 @@ class Status_network extends DB_DataObject 0 != strcasecmp($sn->hostname, $servername)) { $sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']); } else if (!empty($_SERVER['HTTPS']) && - 0 != strcasecmp($sn->sitename.'.'.$wildcard, $servername)) { - $sn->redirectTo('https://'.$sn->sitename.'.'.$wildcard.$_SERVER['REQUEST_URI']); + 0 != strcasecmp($sn->hostname, $servername) && + 0 != strcasecmp($sn->nickname.'.'.$wildcard, $servername)) { + $sn->redirectTo('https://'.$sn->nickname.'.'.$wildcard.$_SERVER['REQUEST_URI']); } $dbhost = (empty($sn->dbhost)) ? 'localhost' : $sn->dbhost; |