]> git.mjollnir.org Git - moodle.git/commitdiff
Make it easier to get out of a switched role in case viewing is not allowed
authormoodler <moodler>
Fri, 22 Sep 2006 01:29:11 +0000 (01:29 +0000)
committermoodler <moodler>
Fri, 22 Sep 2006 01:29:11 +0000 (01:29 +0000)
course/view.php

index 7d85ba99900fa799c3216d9c1113a69ab075cb1c..fb60ea367480cb55022de8dc375632989b3e5684 100644 (file)
         print_error('nocontext');
     }
 
+    if ($switchrole == 0) {  // Remove any switched roles before checking login
+        role_switch($switchrole, $context);
+    }
+
     require_login($course->id);
 
-    if ($switchrole > -1) {
+    if ($switchrole > 0) {
         role_switch($switchrole, $context);
-        require_login($course->id);
+        require_login($course->id);   // Double check that this role is allowed here
     }
 
     //If course is hosted on an external server, redirect to corresponding