From 697bbb9b274460d6b07d2c7e8feb3423a56c30bd Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Mon, 26 Mar 2007 09:28:06 +0000
Subject: [PATCH] Resolved conflict

---
 user/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user/index.php b/user/index.php
index 3bcc2a25d9..34aaa8bf3b 100644
--- 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>';
-- 
2.39.5