GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
root 2010-01-10 08:24:00 +00:00
parent ef0e0116c2 8c6ec0b59e
commit bed903d61c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/login.php
View File

@ -132,7 +132,7 @@ class LoginAction extends Action
$url = common_get_returnto();
if (common_config('ssl', 'sometimes') && // mixed environment
if (common_config('site', 'ssl') == 'sometimes' && // mixed environment
0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) {
$this->redirectFromSSL($user, $url, $this->boolean('rememberme'));
return;