mirror of
https://github.com/moodle/moodle.git
synced 2025-03-24 09:30:17 +01:00
Merge branch 'MDL-65543-master' of git://github.com/andrewnicols/moodle
This commit is contained in:
commit
97b6ea2c30
@ -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');
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user