Fix for 3-month pane event filters, now you don't get a "missing required parameter"

error when you click on them. Reported by Ger Tielemans in the forums.

diff --git a/calendar/lib.php b/calendar/lib.php
index ca9f821db23f46666e1cc2f24d6d31ac7fd01eb7..0339d4059ffeab87d7a1a81768a08aa69207b13d 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -569,32 +569,38 @@ function calendar_top_controls($type, $data) {
     return $content;
 }
 
-function calendar_filter_controls($type) {
+function calendar_filter_controls($type, $vars = NULL) {
     global $CFG, $SESSION;
 
     $groupevents = true;
-    switch($type) {
-        case 'upcoming':
-            $getvars = '';
-        break;
-        case 'prefs':
-            $getvars = '&from=prefs&pref='.$_GET['edit'];
-        break;
-        case 'event':
-            global $day, $mon, $yr;
-            $getvars = '&from=event&id='.$_GET['id'];
-        break;
-        case 'day':
-            global $day, $mon, $yr;
-            $getvars = '&from=day&cal_d='.$day.'&cal_m='.$mon.'&cal_y='.$yr;
-        break;
-        case 'course':
-            global $course;
-            $getvars = '&from=course&id='.$course->id;
-            if($course->groupmode == NOGROUPS && $course->groupmodeforce) {
-                $groupevents = false;
-            }
-        break;
+
+    if($vars === NULL) {
+        switch($type) {
+            case 'upcoming':
+                $getvars = '';
+            break;
+            case 'prefs':
+                $getvars = '&from=prefs&pref='.$_GET['edit'];
+            break;
+            case 'event':
+                global $day, $mon, $yr;
+                $getvars = '&from=event&id='.$_GET['id'];
+            break;
+            case 'day':
+                global $day, $mon, $yr;
+                $getvars = '&from=day&cal_d='.$day.'&cal_m='.$mon.'&cal_y='.$yr;
+            break;
+            case 'course':
+                global $course;
+                $getvars = '&from=course&id='.$course->id;
+                if($course->groupmode == NOGROUPS && $course->groupmodeforce) {
+                    $groupevents = false;
+                }
+            break;
+        }
+    }
+    else {
+        $getvars = '&'.$vars;
     }
 
     $content = '<table class="cal_controls" style="width: 98%;">';

diff --git a/calendar/view.php b/calendar/view.php
index 90418fb547e15abd90be1af837e36af219f82a6b..178f7d87ff1d31cf74608148694bd5ba05287660 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -171,7 +171,8 @@
     print_side_block_start(get_string('monthlyview', 'calendar'), '', 'sideblockmain');
     list($prevmon, $prevyr) = calendar_sub_month($mon, $yr);
     list($nextmon, $nextyr) = calendar_add_month($mon, $yr);
-    echo calendar_filter_controls($_GET['view']);
+    $getvars = 'from=month&cal_d='.$day.'&cal_m='.$mon.'&cal_y='.$yr; // For filtering
+    echo calendar_filter_controls($_GET['view'], $getvars);
     echo '<p>';
     echo calendar_top_controls('display', array('m' => $prevmon, 'y' => $prevyr));
     echo calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);