Corrected a bug that prevented admins from seeing events for ALL site courses

(today's functionality was not complete yet).

Also, minor sorting change to display the course filter sorted by shortname.

diff --git a/calendar/lib.php b/calendar/lib.php
index 0edc01ad7727d6796fc6607f6e817b5c05afe5db..010fc016cb93f96f9e780a6f1a2e92f7e95c56a8 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1105,9 +1105,13 @@ function calendar_edit_event_allowed($event) {
 }
 
 function calendar_get_default_courses() {
-    global $USER;
+    global $USER, $CFG;
 
     $courses = array();
+    if(isadmin($USER->id)) {
+        $courses = get_records_sql('SELECT id, 1 FROM '.$CFG->prefix.'course');
+        return $courses;
+    }
     if(isset($USER->student) && is_array($USER->student)) {
         $courses = $USER->student + $courses;
     }

diff --git a/calendar/view.php b/calendar/view.php
index 511642d7d3bda13b60e7dc9ea440e6613fc700af..007a97d0544c98ab71acc8d107077c835c79253c 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -556,7 +556,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
         $coursesdata = get_courses('all', 'c.shortname');
     }
     else {
-        $coursesdata = get_my_courses($USER->id);
+        $coursesdata = get_my_courses($USER->id, 'shortname');
     }
     $coursesdata = array_diff_assoc($coursesdata, array(1 => 1));