Fix for bugs 1423, 1424 (duplicated):

Now hiding/showing course events in the course view works once more.
Ready for a release, it seems....

diff --git a/blocks/calendar_month/block_calendar_month.php b/blocks/calendar_month/block_calendar_month.php
index 770d7c5881233f3ac90865a06b2c8a96ce6cf162..60b68c51cfc5998922e4857a10093094397cb46d 100644 (file)
--- a/blocks/calendar_month/block_calendar_month.php
+++ b/blocks/calendar_month/block_calendar_month.php
@@ -5,7 +5,7 @@ class CourseBlock_calendar_month extends MoodleBlock {
         $this->title = get_string('calendar', 'calendar');
         $this->content_type = BLOCK_TYPE_TEXT;
         $this->course = $course;
-        $this->version = 2004041000;
+        $this->version = 2004052000;
     }
 
     function get_content() {
@@ -36,7 +36,7 @@ class CourseBlock_calendar_month extends MoodleBlock {
         // We 'll need this later
         calendar_set_referring_course($courseshown);
 
-        if($courseshown !== false) {
+        if($courseshown !== false && $SESSION->cal_show_course !== false) {
             // By default, the course filter will show this course only
             $SESSION->cal_show_course = $courseshown;
         }

diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index e9c7c120234c192a4faa11ec0636427d59a00d2c..01b57389d1d1159b1d04587f73769affdd339954 100644 (file)
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -5,7 +5,7 @@ class CourseBlock_calendar_upcoming extends MoodleBlock {
         $this->title = get_string('upcomingevents', 'calendar');
         $this->content_type = BLOCK_TYPE_TEXT;
         $this->course = $course;
-        $this->version = 2004051000;
+        $this->version = 2004052000;
     }
 
     function get_content() {
@@ -37,7 +37,7 @@ class CourseBlock_calendar_upcoming extends MoodleBlock {
         // We 'll need this later
         calendar_set_referring_course($courseshown);
 
-        if($courseshown !== false) {
+        if($courseshown !== false && $SESSION->cal_show_course !== false) {
             // By default, the course filter will show this course only
             $SESSION->cal_show_course = $courseshown;
         }