Merging patch for improved calendar block behavior from MOODLE_14_STABLE.

diff --git a/blocks/calendar_month/block_calendar_month.php b/blocks/calendar_month/block_calendar_month.php
index 667ede4ff60bc1ed0c3a0e2802109620413a398a..130409f20987332d57740da508a6420f8b8245a4 100644 (file)
--- a/blocks/calendar_month/block_calendar_month.php
+++ b/blocks/calendar_month/block_calendar_month.php
@@ -24,11 +24,23 @@ class CourseBlock_calendar_month extends MoodleBlock {
         $this->content->footer = '';
 
         if (empty($this->course)) { // Overrides: use no course at all
+
             $courseshown = false;
             $filtercourse = array();
+
         } else {
+
             $courseshown = $this->course->id;
-            $filtercourse = array($courseshown => 1);
+
+            if($this->course->id == SITEID) {
+                // Being displayed at site level. This will cause the filter to fall back to auto-detecting
+                // the list of courses it will be grabbing events from.
+                $filtercourse = NULL;
+            }
+            else {
+                // Forcibly filter events to include only those from the particular course we are in.
+                $filtercourse = array($courseshown => 1);
+            }
         }
 
         // We 'll need this later

diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index bcfcccc62dfa86e075cce696de31f3eff4faa1f8..752888762fd1c7c4ed4057ef722584f75183e354 100644 (file)
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -22,19 +22,31 @@ class CourseBlock_calendar_upcoming extends MoodleBlock {
         $this->content = New object;
         $this->content->text = '';
 
-        if (empty($this->course)) {  // Overrides: use no course at all
+        if (empty($this->course)) { // Overrides: use no course at all
+        
             $courseshown = false;
             $filtercourse = array();
             $this->content->footer = '';
+
         } else {
+
             $courseshown = $this->course->id;
-            $filtercourse = array($courseshown => 1);
             $this->content->footer = '<br /><a href="'.$CFG->wwwroot.
                                      '/calendar/view.php?view=upcoming&amp;course='.$this->course->id.'">'.
                                       get_string('gotocalendar', 'calendar').'</a>...';
             $this->content->footer .= '<br /><a href="'.$CFG->wwwroot.
                                       '/calendar/event.php?action=new&amp;course='.$this->course->id.'">'.
                                        get_string('newevent', 'calendar').'</a>...';
+            
+            if($this->course->id == SITEID) {
+                // Being displayed at site level. This will cause the filter to fall back to auto-detecting
+                // the list of courses it will be grabbing events from.
+                $filtercourse = NULL;
+            }
+            else {
+                // Forcibly filter events to include only those from the particular course we are in.
+                $filtercourse = array($courseshown => 1);
+            }
         }
 
         // We 'll need this later