Refs #3510, #3414, #3536. Ported https login fixes to trunk. Will need to backport...

git-svn-id: http://code.elgg.org/elgg/trunk@9142 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index a1d64a76810ee3af48528afc930f523f3aa7e48f..e90cbf10686504c10efebaaaf89c2a4a8ae885f0 100644 (file)
--- 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 57c3c31d72034ab0c229af8eff01045414419b72..9b50190960b39e154680380134059c3261c19cf5 100644 (file)
--- 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());
 }
 
 ?>