Merge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/moodle

diff --git a/enrol/database/lib.php b/enrol/database/lib.php
index 306f8b3..33ddad4 100644 (file)
--- a/enrol/database/lib.php
+++ b/enrol/database/lib.php
@@ -185,7 +185,7 @@ class enrol_database_plugin extends enrol_plugin {
 
             $existing = array();
             foreach ($current as $r) {
-                if (in_array($r->id, $roles)) {
+                if (in_array($r->roleid, $roles)) {
                     $existing[$r->roleid] = $r->roleid;
                 } else {
                     role_unassign($r->roleid, $user->id, $context->id, 'enrol_database', $instance->id);