Merge branch 'MDL-73685-admin-role-bug' of https://github.com/brendanheywood/moodle

This commit is contained in:
Jun Pataleta 2022-08-29 15:47:57 +08:00
commit 0e80be483f

View File

@ -91,8 +91,12 @@ class core_role_admins_existing_selector extends user_selector_base {
} else {
$groupnameprefix = get_string('extusers', 'core_role');
foreach ($availableusers as $user) {
$domain = substr($user->email, strpos($user->email, '@'));
$groupname = "$groupnameprefix $domain";
if (isset($user->email)) {
$domain = substr($user->email, strpos($user->email, '@'));
$groupname = "$groupnameprefix $domain";
} else {
$groupname = $groupnameprefix;
}
$result[$groupname][] = $user;
}
}