Skip to content
Browse files

Merge branch 'w12_MDL-38320_m24_logininfo' of git://github.com/skodak…

…/moodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents 0cb081f + 54aabc8 commit f402d3225fd3a969f39e317aa50bb24b32f9b034 @damyon damyon committed Mar 19, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/outputrenderers.php
  2. +1 −1 theme/mymobile/renderers.php
View
2 lib/outputrenderers.php
@@ -571,7 +571,7 @@ public function login_info($withlinks = null) {
} 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) {
View
2 theme/mymobile/renderers.php
@@ -419,7 +419,7 @@ public function login_info_footer() {
} 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 {

0 comments on commit f402d32

Please sign in to comment.
Something went wrong with that request. Please try again.