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

MDL-60587 block: Correct courseid/categoryid check

Browse Source 
pagelib uses magic getters for both the course, and category.
It does not define the magic __isset function though.
This commit is contained in:
Andrew Nicols
2017-11-03 08:14:56 +08:00
parent e20752c4f5
commit 1ab858314a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/calendar_month/block_calendar_month.php
+2 -2
View File
@@ -48,8 +48,8 @@ class block_calendar_month extends block_base {
$this->content->text = '';
$this->content->footer = '';
$courseid = isset($this->page->course) ? $this->page->course->id : SITEID;
$categoryid = isset($this->page->category) ? $this->page->category->id : null;
$courseid = $this->page->course->id;
$categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT) ? $this->page->category->id : null;
$calendar = \calendar_information::create(time(), $courseid, $categoryid);
list($data, $template) = calendar_get_view($calendar, 'mini');
blocks/calendar_upcoming/block_calendar_upcoming.php
+2 -2
View File
@@ -47,8 +47,8 @@ class block_calendar_upcoming extends block_base {
$this->content->text = '';
$this->content->footer = '';
$courseid = isset($this->page->course) ? $this->page->course->id : SITEID;
$categoryid = isset($this->page->category) ? $this->page->category->id : null;
$courseid = $this->page->course->id;
$categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT) ? $this->page->category->id : null;
$calendar = \calendar_information::create(time(), $courseid, $categoryid);
list($data, $template) = calendar_get_view($calendar, 'upcoming_mini');