Merge branch 'MDL-65703-36' of git://github.com/lameze/moodle into MOODLE_36_STABLE

calendar/classes/external/footer_options_exporter.php

@@ -100,8 +100,6 @@ class footer_options_exporter extends exporter {
             $params['course'] = $this->calendar->course->id;
         } else if (null !== $this->calendar->categoryid && $this->calendar->categoryid > 0) {
             $params['category'] = $this->calendar->categoryid;
-        } else {
-            $params['course'] = SITEID;
         }
 
         return $params;

calendar/managesubscriptions.php

@@ -129,6 +129,10 @@ $params = [];
 $usedefaultfilters = true;
 if (!empty($courseid) && $courseid == SITEID && !empty($types['site'])) {
     $searches[] = "(eventtype = 'site')";
+    $usedefaultfilters = false;
+}
+
+if (!empty($types['user'])) {
     $searches[] = "(eventtype = 'user' AND userid = :userid)";
     $params['userid'] = $USER->id;
     $usedefaultfilters = false;