summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-10 00:19:46 -0800
committerEvan Prodromou <evan@status.net>2010-01-10 00:19:46 -0800
commit06ed0bc7913e6af0a4aaab93459148c690be70f1 (patch)
treeee9ecb1215dfa43119ada39a3b2097acce346967 /actions
parent304f3b4f188d92720848ae1e3ac85ee04bd5ef71 (diff)
correctly check for ssl enabled
Diffstat (limited to 'actions')
-rw-r--r--actions/register.php5
1 files changed, 3 insertions, 2 deletions
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));