mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity

weblib: switchroles_form() user_login_string() handle the new switchroles

Browse Source 
The switched role data bits have moved to a
different place in the session. Trivial to fix here.
This commit is contained in:
martinlanghoff 2007-09-19 07:06:17 +00:00
parent 1c886b238d
commit b1178725a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/weblib.php
View File

@ -3097,9 +3097,9 @@ function user_login_string($course=NULL, $user=NULL) {
if (isset($user->username) && $user->username == 'guest') {
$loggedinas = $realuserinfo.get_string('loggedinasguest').
" (<a $CFG->frametarget href=\"$wwwroot/login/index.php\">".get_string('login').'</a>)';
} else if (!empty($user->switchrole[$context->id])) {
} else if (!empty($user->access['rsw'][$context->path])) {
$rolename = '';
if ($role = get_record('role', 'id', $user->switchrole[$context->id])) {
if ($role = get_record('role', 'id', $user->access['rsw'][$context->path])) {
$rolename = ': '.format_string($role->name);
}
$loggedinas = get_string('loggedinas', 'moodle', $username).$rolename.
@ -4485,7 +4485,7 @@ function switchroles_form($courseid) {
return '';
}
if (!empty($USER->switchrole[$context->id])){ // Just a button to return to normal
if (!empty($user->access['rsw'][$context->path])){ // Just a button to return to normal
$options = array();
$options['id'] = $courseid;
$options['sesskey'] = sesskey();