Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'w40_MDL-35619_m23_otheravatars' of git://github.com/sko…

…dak/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit e1361139d97e55a98fbfd24040c9d90780b31094 2 parents 373d317 + 50675bf
@danpoltawski danpoltawski authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 enrol/locallib.php
View
4 enrol/locallib.php
@@ -766,13 +766,15 @@ public function get_other_users_for_display(core_enrol_renderer $renderer, moodl
$users = array();
foreach ($userroles as $userrole) {
+ $contextid = $userrole->contextid;
+ unset($userrole->contextid); // This would collide with user avatar.
if (!array_key_exists($userrole->id, $users)) {
$users[$userrole->id] = $this->prepare_user_for_display($userrole, $extrafields, $now);
}
$a = new stdClass;
$a->role = $roles[$userrole->roleid]->localname;
$changeable = ($userrole->component == '');
- if ($userrole->contextid == $this->context->id) {
+ if ($contextid == $this->context->id) {
$roletext = get_string('rolefromthiscourse', 'enrol', $a);
} else {
$changeable = false;
Please sign in to comment.
Something went wrong with that request. Please try again.