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 9c0196274cdf435561ff71948bf9e4621aa3917f..00274ee519b5120efdc1e12089dc14f7d74d1bbf 100644 (file)
--- 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);