Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/s…

…kodak/moodle
NoelDeMartin · Nov 1, 2011 · f94d606 · f94d606
2 parents d29f4e0 + 0c2701f
commit f94d606
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/lib/enrollib.php b/lib/enrollib.php
@@ -1133,14 +1133,6 @@ public function enrol_user(stdClass $instance, $userid, $roleid = NULL, $timesta
             $inserted = true;
         }
 
-        if ($roleid) {
-            if ($this->roles_protected()) {
-                role_assign($roleid, $userid, $context->id, 'enrol_'.$name, $instance->id);
-            } else {
-                role_assign($roleid, $userid, $context->id);
-            }
-        }
-
         if ($inserted) {
             // add extra info and trigger event
             $ue->courseid  = $courseid;
@@ -1152,6 +1144,15 @@ public function enrol_user(stdClass $instance, $userid, $roleid = NULL, $timesta
             events_trigger('user_enrol_modified', $ue);
         }
 
+        if ($roleid) {
+            // this must be done after the enrolment event so that the role_assigned event is trigerred aftwerwards
+            if ($this->roles_protected()) {
+                role_assign($roleid, $userid, $context->id, 'enrol_'.$name, $instance->id);
+            } else {
+                role_assign($roleid, $userid, $context->id);
+            }
+        }
+
         // reset primitive require_login() caching
         if ($userid == $USER->id) {
             if (isset($USER->enrol['enrolled'][$courseid])) {