Merge branch 'MDL-65543-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2019-05-09 19:25:55 +02:00
commit 97b6ea2c30

View File

@ -55,6 +55,11 @@ if (!$forum) {
throw new \moodle_exception('Unable to find forum with id ' . $discussion->get_forum_id());
}
$course = $forum->get_course_record();
$cm = $forum->get_course_module_record();
require_course_login($course, true, $cm);
$managerfactory = mod_forum\local\container::get_manager_factory();
$capabilitymanager = $managerfactory->get_capability_manager($forum);
$urlfactory = mod_forum\local\container::get_url_factory();
@ -71,11 +76,6 @@ $discussiondatamapper = $datamapperfactory->get_discussion_data_mapper();
$discussionrecord = $discussiondatamapper->to_legacy_object($discussion);
$discussionviewurl = $urlfactory->get_discussion_view_url_from_discussion($discussion);
$course = $forum->get_course_record();
$cm = $forum->get_course_module_record();
require_course_login($course, true, $cm);
// move this down fix for MDL-6926
require_once($CFG->dirroot . '/mod/forum/lib.php');