L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mdl63321-moodle35' of https://github.com/tlock/moodle into MOODLE_35_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2018-09-12 15:33:48 +08:00
parent 7f08932a68 e0d05a355a
commit 385caa2e24
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/calendar_month/block_calendar_month.php
+2 -1
View File
@@ -49,7 +49,8 @@ class block_calendar_month extends block_base {
$this->content->footer = '';
$courseid = $this->page->course->id;
$categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT) ? $this->page->category->id : null;
$categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT && !empty($this->page->category)) ?
$this->page->category->id : null;
$calendar = \calendar_information::create(time(), $courseid, $categoryid);
list($data, $template) = calendar_get_view($calendar, 'mini', isloggedin(), isloggedin());