fixed - disabled autologinguest not always respected in require_login() SC#255; merge...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 88deb9bdf6a747b656f623a6fac53fb006b1704d..fbcbf840ff76b0bb6d451f80fb72d4695d90e86a 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1621,9 +1621,10 @@ function require_login($courseid=0, $autologinguest=true, $cm=null) {
         }
 
         //User is not enrolled in the course, wants to access course content
-        //as a guest, and course setting allow unlimited guest access
+        //as a guest, and course setting allow unlimited guest access;
+        //do not autologin as guest when $autologinguest is false
         //Code cribbed from course/loginas.php
-        if (strstr($FULLME,"username=guest") && ($course->guest==1)) {
+        if (strstr($FULLME,"username=guest") and ($course->guest==1) and $autologinguest) {
             $realuser = $USER->id;
             $realname = fullname($USER, true);
             $USER = guest_user();