Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
175b370
)
MDL-63321 block: Fix warning in Calendar month block after MDL-60587
author
Tim Lock
<tim@netspot.com.au>
Fri, 7 Sep 2018 04:24:29 +0000
(13:54 +0930)
committer
Tim Lock
<tim@netspot.com.au>
Sun, 9 Sep 2018 22:13:41 +0000
(07:43 +0930)
blocks/calendar_month/block_calendar_month.php
patch
|
blob
|
blame
|
history
diff --git
a/blocks/calendar_month/block_calendar_month.php
b/blocks/calendar_month/block_calendar_month.php
index
00547c6
..
64c2cd2
100644
(file)
--- a/
blocks/calendar_month/block_calendar_month.php
+++ b/
blocks/calendar_month/block_calendar_month.php
@@
-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());