Merge branch 'w51_MDL-30588_m23_switchrole' of git://github.com/skodak/moodle

2011-12-12 17:10:58 +13:00
parent 16fdb8d070 dbd7282ca3
commit 07ae3349fc
1 changed files with 5 additions and 1 deletions
@@ -2760,7 +2760,11 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $

        $access = false;

-        if (is_viewing($coursecontext, $USER)) {
+        if (is_role_switched($course->id)) {
+            // ok, user had to be inside this course before the switch
+            $access = true;
+
+        } else if (is_viewing($coursecontext, $USER)) {
            // ok, no need to mess with enrol
            $access = true;