From 250712fd7fb3e49cc59c65f5cf0950b2001dca45 Mon Sep 17 00:00:00 2001 From: defacer Date: Thu, 20 May 2004 09:58:14 +0000 Subject: [PATCH] Minor modification to the way the course event filter works (same functionality but more robust now). --- calendar/lib.php | 2 +- calendar/set.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/calendar/lib.php b/calendar/lib.php index b3a2ac3723..3362e6f82b 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -239,7 +239,6 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y } function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxevents) { - global $CFG; $display = &New object; @@ -1015,6 +1014,7 @@ function calendar_set_filters(&$courses, &$group, &$user, $defaultcourses = NULL (is_array($SESSION->cal_show_course) && count($SESSION->cal_show_course)) || ($SESSION->cal_show_course === true) ); + if($defaultcourses === NULL) { $defaultcourses = array(); } diff --git a/calendar/set.php b/calendar/set.php index 709b40aa00..5cf05ea80a 100644 --- a/calendar/set.php +++ b/calendar/set.php @@ -68,11 +68,11 @@ $SESSION->cal_show_groups = !$SESSION->cal_show_groups; break; case 'showcourses': - if($SESSION->cal_show_course) { - $SESSION->cal_show_course = false; + if(empty($SESSION->cal_show_course)) { + $SESSION->cal_show_course = calendar_get_default_courses(); } else { - $SESSION->cal_show_course = true; + $SESSION->cal_show_course = false; } break; case 'showglobal': -- 2.39.5