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

Merge branch 'MDL-60806-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2017-11-20 15:23:42 +08:00
parent 8ee2d9c3d4 5e8e87aaee
commit e590227922
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/lib.php
+2 -2
View File
@@ -1056,7 +1056,7 @@ class calendar_information {
}
$courses = [$course->id => $course];
$category = (\coursecat::get($course->category))->get_db_record();
$category = (\coursecat::get($course->category, MUST_EXIST, true))->get_db_record();
} else if (!empty($categoryid)) {
$course = get_site();
$courses = calendar_get_default_courses();
@@ -1147,7 +1147,7 @@ class calendar_information {
// A specific course was requested.
// Fetch the category that this course is in, along with all parents.
// Do not include child categories of this category, as the user many not have enrolments in those siblings or children.
$category = \coursecat::get($course->category);
$category = \coursecat::get($course->category, MUST_EXIST, true);
$this->categoryid = $category->id;
$this->categories = $category->get_parents();