From 78ad30d6628fb9e9ec283c5c9930e57d8c82e710 Mon Sep 17 00:00:00 2001 From: Ilya Tregubov Date: Thu, 7 Oct 2021 11:58:57 +0700 Subject: [PATCH] MDL-72753 courseformat: Fix broken site installation via UI. Fixing regression caused by MDL-71795. --- lib/outputrequirementslib.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php index a7400d2925c..8341b9a9882 100644 --- a/lib/outputrequirementslib.php +++ b/lib/outputrequirementslib.php @@ -318,11 +318,10 @@ class page_requirements_manager { if (!is_null($page->context)) { $contextid = $page->context->id; $contextinstanceid = $page->context->instanceid; + $courseid = $page->course->id; + $coursecontext = context_course::instance($courseid); } - $courseid = $page->course->id; - $coursecontext = context_course::instance($courseid); - $this->M_cfg = array( 'wwwroot' => $CFG->wwwroot, 'sesskey' => sesskey(), @@ -336,8 +335,8 @@ class page_requirements_manager { 'admin' => $CFG->admin, 'svgicons' => $page->theme->use_svg_icons(), 'usertimezone' => usertimezone(), - 'courseId' => (int) $courseid, - 'courseContextId' => $coursecontext->id, + 'courseId' => isset($courseid) ? (int) $courseid : 0, + 'courseContextId' => isset($coursecontext) ? $coursecontext->id : 0, 'contextid' => $contextid, 'contextInstanceId' => (int) $contextinstanceid, 'langrev' => get_string_manager()->get_revision(),