From bacafa1ca9e0ec5c7523bb360abcdc977d422f00 Mon Sep 17 00:00:00 2001
From: defacer <defacer>
Date: Fri, 7 May 2004 10:42:11 +0000
Subject: [PATCH] Modified the behavior of upcoming events block to be the same
 as month block, even though there is no way to go from it to the detailed
 month view right now.

---
 .../block_calendar_upcoming.php               | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index b68d8f2d16..9c261c1041 100644
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -36,15 +36,24 @@ class CourseBlock_calendar_upcoming extends MoodleBlock {
         // We 'll need this later
         calendar_set_referring_course($courseshown);
 
+        if($courseshown !== false) {
+            // By default, the course filter will show this course only
+            $SESSION->cal_show_course = $courseshown;
+        }
+
+        // [pj] Let's leave this in, the above may not be the final solution
+        /*
         if($courseshown !== false && is_int($SESSION->cal_show_course) && $SESSION->cal_show_course != $courseshown) {
             // There is a filter in action that shows events from a course other than the current
-            // Obviously we have to cut it out
-            $SESSION->cal_show_course = true;
-
-        } else if($courseshown !== false && is_array($SESSION->cal_show_course) && !in_array($courseshown, $SESSION->cal_show_course)) {
+            // Change it to show only the current course
+            $SESSION->cal_show_course = $courseshown;
+        }
+        else if($courseshown !== false && is_array($SESSION->cal_show_course) && !in_array($courseshown, $SESSION->cal_show_course)) {
             // Same as above, only there are many courses being shown. Unfortunately, not this one.
-            $SESSION->cal_show_course = true;
+            // Change it to show only the current course
+            $SESSION->cal_show_course = $courseshown;
         }
+        */
 
         // Be VERY careful with the format for default courses arguments!
         // Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions.
-- 
2.39.5