mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-12 01:46:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2012-05-14 14:04:21 +12:00
parent 924c34df8c d083084a23
commit 04d7103804
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/lib.php
View File

@ -1491,15 +1491,16 @@ function calendar_get_default_courses() {
} }
$courses = array(); $courses = array();
if (!empty($CFG->calendar_adminseesall) && has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM))) { if (!empty($CFG->calendar_adminseesall) && has_capability('moodle/calendar:manageentries', context_system::instance())) {
list ($select, $join) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx'); list ($select, $join) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
$sql = "SELECT DISTINCT c.* $select $sql = "SELECT c.* $select
FROM {course} c FROM {course} c
JOIN {event} e ON e.courseid = c.id $join
$join"; WHERE EXISTS (SELECT 1 FROM {event} e WHERE e.courseid = c.id)
";
$courses = $DB->get_records_sql($sql, null, 0, 20); $courses = $DB->get_records_sql($sql, null, 0, 20);
foreach ($courses as $course) { foreach ($courses as $course) {
context_instance_preload($course); context_helper::preload_from_record($course);
} }
return $courses; return $courses;
} }