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

diff --git a/actions/login.php b/actions/login.php
index ea9b96a46b73fa53b1d6a6cce5d79f1e60c3edc9..8694de188e73575e398e265b5a9c0323f5db33c9 100644 (file)
--- 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;