From 00cda46fae82a02e1d7ab45d6869e2170b03835a Mon Sep 17 00:00:00 2001 From: Peter Dias Date: Tue, 14 Dec 2021 14:32:37 +0800 Subject: [PATCH 1/2] MDL-72413 core: Disable the default activity header --- lib/outputrenderers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index b478e9566b3..228960802f3 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1403,7 +1403,7 @@ class core_renderer extends renderer_base { $this->page->set_state(moodle_page::STATE_IN_BODY); // If an activity record has been set, activity_header will handle this. - if (!$this->page->activityrecord || !empty($this->page->layout_options['noactivityheader'])) { + if (!$this->page->cm || !empty($this->page->layout_options['noactivityheader'])) { $header .= $this->skip_link_target('maincontent'); } return $header; From 90438c21d69f9ab34ebca745e514a1bd7be31c10 Mon Sep 17 00:00:00 2001 From: Peter Dias Date: Tue, 14 Dec 2021 14:33:26 +0800 Subject: [PATCH 2/2] MDL-72413 forum: Use the common module for setting the header --- mod/forum/discuss.php | 2 ++ mod/forum/view.php | 1 + 2 files changed, 3 insertions(+) diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index 7730542cd40..bad6e09bc52 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -75,6 +75,8 @@ $forumrecord = $forumdatamapper->to_legacy_object($forum); $discussiondatamapper = $datamapperfactory->get_discussion_data_mapper(); $discussionrecord = $discussiondatamapper->to_legacy_object($discussion); $discussionviewurl = $urlfactory->get_discussion_view_url_from_discussion($discussion); +// Set the activity record, to avoid additional calls to the db if the page getter is called. +$PAGE->set_activity_record($forumrecord); // move this down fix for MDL-6926 require_once($CFG->dirroot . '/mod/forum/lib.php'); diff --git a/mod/forum/view.php b/mod/forum/view.php index 94a36c51e9b..a9387fbfe84 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -139,6 +139,7 @@ if (!$capabilitymanager->can_view_discussions($USER)) { // Mark viewed and trigger the course_module_viewed event. $forumdatamapper = $legacydatamapperfactory->get_forum_data_mapper(); $forumrecord = $forumdatamapper->to_legacy_object($forum); +$PAGE->set_activity_record($forumrecord); forum_view( $forumrecord, $forum->get_course_record(),