moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for bug 1442

Browse source 
- notices
   - course is now properly passed to calendar_filter_controls from block
This commit is contained in:
moodler 2004-05-24 01:28:28 +00:00
parent d980b5da22
commit 3cb9ee3949
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
calendar/lib.php
View file

@ -559,10 +559,11 @@ function calendar_top_controls($type, $data) {
return $content;
}
function calendar_filter_controls($type, $vars = NULL) {
function calendar_filter_controls($type, $vars = NULL, $course = NULL) {
global $CFG, $SESSION, $USER;
$groupevents = true;
$getvars = '';
switch($type) {
case 'upcoming':
@ -573,13 +574,13 @@ function calendar_filter_controls($type, $vars = NULL) {
break;
case 'course':
$getvars = '&from=course&id='.$_GET['id'];
if($course->groupmode == NOGROUPS && $course->groupmodeforce) {
if (isset($course->groupmode) and !$course->groupmode and $course->groupmodeforce) {
$groupevents = false;
}
break;
}
if(!empty($vars)) {
if (!empty($vars)) {
$getvars .= '&'.$vars;
}