From f2cf0f8419f7f0729841cb96869d83140d9353fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Sun, 17 Mar 2013 21:13:28 +0100
Subject: [PATCH] MDL-38320 fix role name display when roles switched

---
 lib/outputrenderers.php      | 2 +-
 theme/mymobile/renderers.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 70af409ee5f..019f01982ea 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -601,7 +601,7 @@ class core_renderer extends renderer_base {
             } else if (is_role_switched($course->id)) { // Has switched roles
                 $rolename = '';
                 if ($role = $DB->get_record('role', array('id'=>$USER->access['rsw'][$context->path]))) {
-                    $rolename = ': '.format_string($role->name);
+                    $rolename = ': '.role_get_name($role, $context);
                 }
                 $loggedinas = get_string('loggedinas', 'moodle', $username).$rolename;
                 if ($withlinks) {
diff --git a/theme/mymobile/renderers.php b/theme/mymobile/renderers.php
index 6e75f607ed1..86551c64419 100644
--- a/theme/mymobile/renderers.php
+++ b/theme/mymobile/renderers.php
@@ -419,7 +419,7 @@ class theme_mymobile_core_renderer extends core_renderer {
             } else if (is_role_switched($course->id)) { // Has switched roles
                 $rolename = '';
                 if ($role = $DB->get_record('role', array('id'=>$USER->access['rsw'][$context->path]))) {
-                    $rolename = ': '.format_string($role->name);
+                    $rolename = ': '.role_get_name($role, $context);
                 }
                 $loggedinas = get_string('loggedinas', 'moodle', $username).$rolename." (<a href=\"$CFG->wwwroot/course/view.php?id=$course->id&amp;switchrole=0&amp;sesskey=".sesskey()."\">".get_string('switchrolereturn').'</a>)';
             } else {