From a6bc0fd2b6e4a11dfc31c2db78beabdf7779cc0c Mon Sep 17 00:00:00 2001 From: dongsheng Date: Tue, 22 Apr 2008 06:08:47 +0000 Subject: [PATCH] MDL-14460, fix get_context_instance, see tracker --- calendar/lib.php | 4 ++-- calendar/view.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/lib.php b/calendar/lib.php index 73b4a90c9db..329be325c74 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -1292,7 +1292,7 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU } // XXX TODO: not sure how to replace $CFG->calendar_adminseesall - if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($CFG->calendar_adminseesall)) { + if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) { $group = true; } else { @@ -1377,7 +1377,7 @@ function calendar_edit_event_allowed($event) { return false; } - $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $sitecontext = get_context_instance(CONTEXT_SYSTEM); // if user has manageentries at site level, return true if (has_capability('moodle/calendar:manageentries', $sitecontext)) { return true; diff --git a/calendar/view.php b/calendar/view.php index a8c9431222c..6eb8184ff47 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -608,7 +608,7 @@ function calendar_course_filter_selector($getvars = '') { return ''; } - if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($CFG->calendar_adminseesall)) { + if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) { $courses = get_courses('all', 'c.shortname','c.id,c.shortname'); } else { $courses = get_my_courses($USER->id, 'shortname');