From: moodler <moodler>
Date: Fri, 22 Sep 2006 01:29:11 +0000 (+0000)
Subject: Make it easier to get out of a switched role in case viewing is not allowed
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ac4c51bef54cb6adea5c113faf1fb89edc3f159a;p=moodle.git

Make it easier to get out of a switched role in case viewing is not allowed
---

diff --git a/course/view.php b/course/view.php
index 7d85ba9990..fb60ea3674 100644
--- a/course/view.php
+++ b/course/view.php
@@ -41,11 +41,15 @@
         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