mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
Merging fix for bug 1957 from MOODLE_14_STABLE.
This commit is contained in:
parent
9ef95d14bb
commit
02ce384808
3 changed files with 23 additions and 32 deletions
|
@ -864,6 +864,19 @@ function calendar_get_course_cached(&$coursecache, $courseid) {
|
|||
function calendar_session_vars() {
|
||||
global $SESSION, $USER;
|
||||
|
||||
if(isset($USER) && isset($USER->realuser) && !isset($SESSION->cal_loggedinas)) {
|
||||
// We just logged in as someone else, update the filtering
|
||||
unset($SESSION->cal_users_shown);
|
||||
unset($SESSION->cal_courses_shown);
|
||||
$SESSION->cal_loggedinas = true;
|
||||
}
|
||||
else if(isset($USER) && !isset($USER->realuser) && isset($SESSION->cal_loggedinas)) {
|
||||
// We just logged back to our real self, update again
|
||||
unset($SESSION->cal_users_shown);
|
||||
unset($SESSION->cal_courses_shown);
|
||||
unset($SESSION->cal_loggedinas);
|
||||
}
|
||||
|
||||
if(!isset($SESSION->cal_course_referer)) {
|
||||
$SESSION->cal_course_referer = 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue