diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-06-07 23:17:38 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-06-07 23:17:38 +0000 |
| commit | 8ddeb1f6e37dc1647e9bee4f3cfe35adcb2ca004 (patch) | |
| tree | 921e321c087dfa57fe5f1842390a3317ee561097 | |
| parent | 22f8de74875e5351fd7711f3b7b2b430c98f1c05 (diff) | |
| download | elgg-8ddeb1f6e37dc1647e9bee4f3cfe35adcb2ca004.tar.gz elgg-8ddeb1f6e37dc1647e9bee4f3cfe35adcb2ca004.tar.bz2 | |
Refs #3510, #3414, #3536. Ported https login fixes to trunk. Will need to backport changes to 1.7 for #3536.
git-svn-id: http://code.elgg.org/elgg/trunk@9142 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/core/account/login_dropdown.php | 4 | ||||
| -rw-r--r-- | views/default/core/account/login_walled_garden.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index a1d64a768..e90cbf106 100644 --- a/views/default/core/account/login_dropdown.php +++ b/views/default/core/account/login_dropdown.php @@ -9,7 +9,7 @@ if (elgg_is_logged_in()) { $login_url = elgg_get_site_url(); if (elgg_get_config('https_login')) { - $login_url = str_replace("http", "https", elgg_get_site_url()); + $login_url = str_replace("http:", "https:", elgg_get_site_url()); } $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE)); @@ -24,4 +24,4 @@ $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), a )); echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); ?> -</div>
\ No newline at end of file +</div> diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 57c3c31d7..9b5019096 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -20,7 +20,7 @@ $form_body .= elgg_view('input/hidden', array( $login_url = elgg_get_site_url(); if (elgg_get_config('https_login')) { - $login_url = str_replace("http", "https", elgg_get_site_url()); + $login_url = str_replace("http:", "https:", elgg_get_site_url()); } ?> |