Merge branch 'w36_MDL-29306_m21_dbenrolroles' of git://github.com/skodak/moodle into MOODLE_21_STABLE

2011-09-12 15:30:33 +12:00
parent 786a905607 3dfac46e97
commit 4a277f4f4e
1 changed files with 8 additions and 0 deletions
@@ -446,6 +446,14 @@ class enrol_database_plugin extends enrol_plugin {
                    }
                }

+                // assign extra roles
+                foreach ($userroles as $roleid) {
+                    if (empty($current_roles[$userid][$roleid])) {
+                        role_assign($roleid, $userid, $context->id, 'enrol_database', $instance->id);
+                        $current_roles[$userid][$roleid] = $roleid;
+                    }
+                }
+
                // unassign removed roles
                foreach($current_roles[$userid] as $cr) {
                    if (empty($userroles[$cr])) {