mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Merge branch 'MDL-65703-master' of git://github.com/lameze/moodle
This commit is contained in:
commit
92198c5b9e
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user