diff options
| author | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 08:24:00 +0000 |
|---|---|---|
| committer | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 08:24:00 +0000 |
| commit | bed903d61c9631187b7c3c01f47ae0e6c197acb8 (patch) | |
| tree | 365001326a40db5b213f2caf4ef8b6afb1fc8525 | |
| parent | ef0e0116c200cc805522239794c1fbf279e204e6 (diff) | |
| parent | 8c6ec0b59ef282c5b2910689255b52de99d477a2 (diff) | |
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
| -rw-r--r-- | actions/login.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/login.php b/actions/login.php index ea9b96a46..8694de188 100644 --- a/actions/login.php +++ b/actions/login.php @@ -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; |