Merge branch 'MDL-65528-master' of git://github.com/peterRd/moodle

This commit is contained in:
Sara Arjona 2019-05-15 12:14:46 +02:00
commit 384145b1d1

View File

@ -162,7 +162,6 @@ class discussion_list {
$forumview = [
'forum' => (array) $forumexporter->export($this->renderer),
'newdiscussionhtml' => $this->get_discussion_form($user, $cm, $groupid),
'groupchangemenu' => groups_print_activity_menu(
$cm,
$this->urlfactory->get_forum_view_url_from_forum($forum),
@ -178,6 +177,10 @@ class discussion_list {
'visiblediscussioncount' => count($discussions)
];
if ($forumview['forum']['capabilities']['create']) {
$forumview['newdiscussionhtml'] = $this->get_discussion_form($user, $cm, $groupid);
}
if (!$discussions) {
return $this->renderer->render_from_template($this->template, $forumview);
}