From: skodak <skodak>
Date: Tue, 3 Apr 2007 14:59:56 +0000 (+0000)
Subject: MDL-9170  https redirect doesn't happen on login page - fixed problem when guest... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ad56b737740b5391bcff8824978bdc8413e49652;p=moodle.git

MDL-9170  https redirect doesn't happen on login page - fixed problem when guest button disabled; merged from MOODLE_18_STABLE
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 00274ee519..6a21fb173f 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1636,7 +1636,7 @@ function require_login($courseorid=0, $autologinguest=true, $cm=null) {
         if (!empty($_SERVER['HTTP_REFERER'])) {
             $SESSION->fromurl  = $_SERVER['HTTP_REFERER'];
         }
-        if ($autologinguest and !empty($CFG->autologinguests) and ($COURSE->id == SITEID or $COURSE->guest) ) {
+        if ($autologinguest and !empty($CFG->guestloginbutton) and !empty($CFG->autologinguests) and ($COURSE->id == SITEID or $COURSE->guest) ) {
             $loginguest = '?loginguest=true';
         } else {
             $loginguest = '';