diff options
| author | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 00:31:37 +0000 |
|---|---|---|
| committer | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 00:31:37 +0000 |
| commit | ac6762ce382a6e6f1c8d104b243c8e48cab2b47e (patch) | |
| tree | 962f27cbb442dc37642ef3d11b0527507cab56ab | |
| parent | 4ffc28e1a5ffa38e3a8b670690ef5764e4edeefb (diff) | |
| parent | deb5ee61542d01d90c0b0a462d5be2fdf5b876bb (diff) | |
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
| -rw-r--r-- | classes/Status_network.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php index 8dff879df..dce3e0b8f 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -154,10 +154,10 @@ class Status_network extends DB_DataObject // Redirect to the right URL if (!empty($sn->hostname) && - empty($SERVER['HTTPS']) && + empty($_SERVER['HTTPS']) && 0 != strcasecmp($sn->hostname, $servername)) { $sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']); - } else if (!empty($SERVER['HTTPS']) && + } else if (!empty($_SERVER['HTTPS']) && 0 != strcasecmp($sn->sitename.'.'.$wildcard, $servername)) { $sn->redirectTo('https://'.$sn->sitename.'.'.$wildcard.$_SERVER['REQUEST_URI']); } |