From: jerome <jerome>
Date: Fri, 30 Jan 2009 06:27:20 +0000 (+0000)
Subject: calendar MDL-14693 fix month link when calendar is displayed on a text page resource... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b894086df5bb223730a68990b9dab67693f00947;p=moodle.git

calendar MDL-14693 fix month link when calendar is displayed on a text page resource, merged from 1.9
---

diff --git a/blocks/calendar_month/block_calendar_month.php b/blocks/calendar_month/block_calendar_month.php
index 8a02ed57a1..626864a03b 100644
--- a/blocks/calendar_month/block_calendar_month.php
+++ b/blocks/calendar_month/block_calendar_month.php
@@ -41,6 +41,8 @@ class block_calendar_month extends block_base {
             calendar_set_referring_course(0);
 
         } else {
+            //MDL-14693: fix calendar on resource page
+            $courseshown =  optional_param( 'id', $COURSE->id, PARAM_INT );
             // Forcibly filter events to include only those from the particular course we are in.
             $filtercourse    = array($courseshown => $COURSE);
             $groupeventsfrom = array($courseshown => 1);