Resolved conflict
This commit is contained in:
+2
-2
@@ -402,8 +402,8 @@
|
||||
error('That role does not exist');
|
||||
}
|
||||
$a->number = $totalcount;
|
||||
$a->role = role_get_name($currentrole, $context);
|
||||
$heading = get_string('xuserswiththerole', 'role', $a);
|
||||
$a->role = $currentrole->name;
|
||||
$heading = format_string(get_string('xuserswiththerole', 'role', $a));
|
||||
if (user_can_assign($context, $roleid)) {
|
||||
$heading .= ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?roleid='.$roleid.'&contextid='.$context->id.'">';
|
||||
$heading .= '<img src="'.$CFG->pixpath.'/i/edit.gif" class="icon" alt="" /></a>';
|
||||
|
||||
Reference in New Issue
Block a user