MDL-43619 Roles: reset_role_capabilities function destroys overrides

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 8e92faf..5122bdb 100644 (file)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2626,7 +2626,8 @@ function reset_role_capabilities($roleid) {
 
     $systemcontext = context_system::instance();
 
-    $DB->delete_records('role_capabilities', array('roleid'=>$roleid));
+    $DB->delete_records('role_capabilities',
+            array('roleid'=>$roleid, 'contextid' => $systemcontext->id));
 
     foreach($defaultcaps as $cap=>$permission) {
         assign_capability($cap, $permission, $roleid, $systemcontext->id);