moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-72413-performance-patch' of https://github.com/ilyatregubov/moodle

Browse source
This commit is contained in:
Ilya Tregubov 2021-12-14 13:53:36 +02:00
commit c304a77326
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/outputrenderers.php
View file

@ -1403,7 +1403,7 @@ class core_renderer extends renderer_base {
$this->page->set_state(moodle_page::STATE_IN_BODY); $this->page->set_state(moodle_page::STATE_IN_BODY);
// If an activity record has been set, activity_header will handle this. // 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'); $header .= $this->skip_link_target('maincontent');
} }
return $header; return $header;

2
mod/forum/discuss.php
View file

@ -75,6 +75,8 @@ $forumrecord = $forumdatamapper->to_legacy_object($forum);
$discussiondatamapper = $datamapperfactory->get_discussion_data_mapper(); $discussiondatamapper = $datamapperfactory->get_discussion_data_mapper();
$discussionrecord = $discussiondatamapper->to_legacy_object($discussion); $discussionrecord = $discussiondatamapper->to_legacy_object($discussion);
$discussionviewurl = $urlfactory->get_discussion_view_url_from_discussion($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 // move this down fix for MDL-6926
require_once($CFG->dirroot . '/mod/forum/lib.php'); require_once($CFG->dirroot . '/mod/forum/lib.php');

1
mod/forum/view.php
View file

@ -139,6 +139,7 @@ if (!$capabilitymanager->can_view_discussions($USER)) {
// Mark viewed and trigger the course_module_viewed event. // Mark viewed and trigger the course_module_viewed event.
$forumdatamapper = $legacydatamapperfactory->get_forum_data_mapper(); $forumdatamapper = $legacydatamapperfactory->get_forum_data_mapper();
$forumrecord = $forumdatamapper->to_legacy_object($forum); $forumrecord = $forumdatamapper->to_legacy_object($forum);
$PAGE->set_activity_record($forumrecord);
forum_view( forum_view(
$forumrecord, $forumrecord,
$forum->get_course_record(), $forum->get_course_record(),