diff -rupN old/calendar/lib.php new/calendar/lib.php
--- old/calendar/lib.php	2009-12-04 14:07:06.000000000 -0600
+++ new/calendar/lib.php	2009-12-04 14:06:57.000000000 -0600
@@ -1291,8 +1291,8 @@ function calendar_set_filters(&$courses,
             $groupcourses = array_keys($groupeventsfrom);
         }
 
-        // XXX TODO: not sure how to replace $CFG->calendar_adminseesall
-        if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) {
+        // MDL-5476 Changed to only check calendar_adminseesall if there is no course specified.
+        if($courseeventsfrom == 1 && has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) {
             $group = true;
         }
         else {