eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

Browse Source
This commit is contained in:
root 2010-01-10 00:31:37 +00:00
commit ac6762ce38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Status_network.php
View File

@ -154,10 +154,10 @@ class Status_network extends DB_DataObject
// Redirect to the right URL // Redirect to the right URL
if (!empty($sn->hostname) && if (!empty($sn->hostname) &&
empty($SERVER['HTTPS']) && empty($_SERVER['HTTPS']) &&
0 != strcasecmp($sn->hostname, $servername)) { 0 != strcasecmp($sn->hostname, $servername)) {
$sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']); $sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']);
} else if (!empty($SERVER['HTTPS']) && } else if (!empty($_SERVER['HTTPS']) &&
0 != strcasecmp($sn->sitename.'.'.$wildcard, $servername)) { 0 != strcasecmp($sn->sitename.'.'.$wildcard, $servername)) {
$sn->redirectTo('https://'.$sn->sitename.'.'.$wildcard.$_SERVER['REQUEST_URI']); $sn->redirectTo('https://'.$sn->sitename.'.'.$wildcard.$_SERVER['REQUEST_URI']);
} }