Resolved conflict

diff --git a/user/index.php b/user/index.php
index 3bcc2a25d9a4c6e369b6cc1a93eedd53340f26e8..34aaa8bf3b79af203ae13032177ee091d7a09e7c 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -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.'&amp;contextid='.$context->id.'">';
             $heading .= '<img src="'.$CFG->pixpath.'/i/edit.gif" class="icon" alt="" /></a>';