Fix for bugs 1423, 1424 (duplicated):
Now hiding/showing course events in the course view works once more. Ready for a release, it seems....
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user