Admin role assignment: changed from using get_string (too brittle) to

get_roles_with_capability (more robust).

diff --git a/admin/user.php b/admin/user.php
index bbf79da5b08316978f7de4cec6c99ad60ae2f942..dd518ef36a8574ad9f7a07a47997655ad137e0cf 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -55,8 +55,12 @@
 
 
         // Assign the default admin role to the new user.
-        $adminrole = get_record('role', 'name', get_string('administrator'));
-        role_assign($adminrole->id, $user->id, 0, $context->id);
+        if (!$adminroles = get_roles_with_capability('moodle/legacy:admin', CAP_ALLOW)) {
+            error('No admin role could be found');
+        }
+        foreach ($adminroles as $adminrole) {
+            role_assign($adminrole->id, $user->id, 0, $context->id);
+        }
         set_config('rolesactive', 1);