From: skodak <skodak>
Date: Mon, 2 Apr 2007 13:59:36 +0000 (+0000)
Subject: MDL-9170 https redirect doesn't happen on login page; merged from MOODLE_18_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2c040c29df1cb28c2b07ef1184343572def1fe2a;p=moodle.git

MDL-9170 https redirect doesn't happen on login page; merged from MOODLE_18_STABLE
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 9c0196274c..00274ee519 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1641,7 +1641,7 @@ function require_login($courseorid=0, $autologinguest=true, $cm=null) {
         } else {
             $loginguest = '';
         }
-        if (empty($CFG->loginhttps) or $autologinguest) { //do not require https for guest logins
+        if (empty($CFG->loginhttps) or $loginguest) { //do not require https for guest logins
             redirect($CFG->wwwroot .'/login/index.php'. $loginguest);
         } else {
             $wwwroot = str_replace('http:','https:', $CFG->wwwroot);