Minor modification to the way the course event filter works

(same functionality but more robust now).

diff --git a/calendar/lib.php b/calendar/lib.php
index b3a2ac372315481ca9e6af014f9110bc75c59ef7..3362e6f82bd84c163864790d1a1435a9fb9c8620 100644 (file)
--- 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 709b40aa00d61fba422447418e86010c2df63e30..5cf05ea80a244725e4eca0538724c4cf6b262d36 100644 (file)
--- 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':