diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/login.php | 2 | ||||
| -rw-r--r-- | actions/register.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/actions/login.php b/actions/login.php index a2f853e3a..ea9b96a46 100644 --- a/actions/login.php +++ b/actions/login.php @@ -133,7 +133,7 @@ class LoginAction extends Action $url = common_get_returnto(); if (common_config('ssl', 'sometimes') && // mixed environment - common_config('site', 'server') != common_config('site', 'sslserver')) { + 0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) { $this->redirectFromSSL($user, $url, $this->boolean('rememberme')); return; } diff --git a/actions/register.php b/actions/register.php index 108d05f5a..ec6534eee 100644 --- a/actions/register.php +++ b/actions/register.php @@ -260,8 +260,9 @@ class RegisterAction extends Action // Re-init language env in case it changed (not yet, but soon) common_init_language(); - if (common_config('ssl', 'sometimes') && // mixed environment - common_config('site', 'server') != common_config('site', 'sslserver')) { + if (common_config('site', 'ssl') == 'sometimes' && // mixed environment + 0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) { + $url = common_local_url('all', array('nickname' => $user->nickname)); |