moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved conflict

Browse source
This commit is contained in:
nicolasconnault 2007-03-26 09:28:06 +00:00
parent 1ecd677e1c
commit 697bbb9b27
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
user/index.php
View file

@ -402,8 +402,8 @@
error('That role does not exist'); error('That role does not exist');
} }
$a->number = $totalcount; $a->number = $totalcount;
$a->role = role_get_name($currentrole, $context); $a->role = $currentrole->name;
$heading = get_string('xuserswiththerole', 'role', $a); $heading = format_string(get_string('xuserswiththerole', 'role', $a));
if (user_can_assign($context, $roleid)) { if (user_can_assign($context, $roleid)) {
$heading .= ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?roleid='.$roleid.'&amp;contextid='.$context->id.'">'; $heading .= ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?roleid='.$roleid.'&amp;contextid='.$context->id.'">';
$heading .= '<img src="'.$CFG->pixpath.'/i/edit.gif" class="icon" alt="" /></a>'; $heading .= '<img src="'.$CFG->pixpath.'/i/edit.gif" class="icon" alt="" /></a>';