Merge branch 'MDL-73365' of https://github.com/paulholden/moodle

moodle · Jan 17, 2022 · 65041d8 · 65041d8
2 parents 475a400 + 2ae0424
commit 65041d8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/report/log/index.php b/report/log/index.php
@@ -50,8 +50,7 @@
 if (!empty($id)) {
     $params['id'] = $id;
 } else {
-    $site = get_site();
-    $id = $site->id;
+    $id = $SITE->id;
 }
 if ($group !== 0) {
     $params['group'] = $group;
@@ -106,12 +105,12 @@
 $PAGE->set_pagelayout('report');
 
 // Get course details.
-$course = null;
-if ($id) {
+if ($id != $SITE->id) {
     $course = $DB->get_record('course', array('id' => $id), '*', MUST_EXIST);
     require_login($course);
     $context = context_course::instance($course->id);
 } else {
+    $course = $SITE;
     require_login();
     $context = context_system::instance();
     $PAGE->set_context($context);
@@ -142,7 +141,7 @@
     $USER->editing = $adminediting;
 }
 
-if (empty($course) || ($course->id == $SITE->id)) {
+if ($course->id == $SITE->id) {
     admin_externalpage_setup('reportlog', '', null, '', array('pagelayout' => 'report'));
     $PAGE->set_title($SITE->shortname .': '. $strlogs);
 } else {