';
+ if ($forum->type == 'news') {
+ echo '('.get_string('nonews', 'forum').')';
+ } else if ($forum->type == 'qanda') {
+ echo '('.get_string('noquestions', 'forum').')';
+ } else {
+ echo '('.get_string('nodiscussions', 'forum').')';
+ }
+ echo "
\n";
+ return;
+ }
+
+ $canseeprivatereplies = has_capability('mod/forum:readprivatereplies', $context);
+ // If we want paging.
+ if ($page != -1) {
+ // Get the number of discussions found.
+ $numdiscussions = forum_get_discussions_count($cm);
+
+ // Show the paging bar.
+ echo $OUTPUT->paging_bar($numdiscussions, $page, $perpage, "view.php?f=$forum->id");
+ if ($numdiscussions > 1000) {
+ // Saves some memory on sites with very large forums.
+ $replies = forum_count_discussion_replies($forum->id, $sort, $maxdiscussions, $page, $perpage, $canseeprivatereplies);
+ } else {
+ $replies = forum_count_discussion_replies($forum->id, "", -1, -1, 0, $canseeprivatereplies);
+ }
+
+ } else {
+ $replies = forum_count_discussion_replies($forum->id, "", -1, -1, 0, $canseeprivatereplies);
+
+ if ($maxdiscussions > 0 and $maxdiscussions <= count($discussions)) {
+ $olddiscussionlink = true;
+ }
+ }
+
+ $canviewparticipants = course_can_view_participants($context);
+ $canviewhiddentimedposts = has_capability('mod/forum:viewhiddentimedposts', $context);
+
+ $strdatestring = get_string('strftimerecentfull');
+
+ // Check if the forum is tracked.
+ if ($cantrack = forum_tp_can_track_forums($forum)) {
+ $forumtracked = forum_tp_is_tracked($forum);
+ } else {
+ $forumtracked = false;
+ }
+
+ if ($forumtracked) {
+ $unreads = forum_get_discussions_unread($cm);
+ } else {
+ $unreads = array();
+ }
+
+ if ($displayformat == 'header') {
+ echo '';
+ }
+
+ if ($olddiscussionlink) {
+ if ($forum->type == 'news') {
+ $strolder = get_string('oldertopics', 'forum');
+ } else {
+ $strolder = get_string('olderdiscussions', 'forum');
+ }
+ echo '';
- if ($forum->type == 'news') {
- echo '('.get_string('nonews', 'forum').')';
- } else if ($forum->type == 'qanda') {
- echo '('.get_string('noquestions','forum').')';
- } else {
- echo '('.get_string('nodiscussions', 'forum').')';
- }
- echo "
\n";
- return;
- }
-
-// If we want paging
- if ($page != -1) {
- ///Get the number of discussions found
- $numdiscussions = forum_get_discussions_count($cm);
-
- ///Show the paging bar
- echo $OUTPUT->paging_bar($numdiscussions, $page, $perpage, "view.php?f=$forum->id");
- if ($numdiscussions > 1000) {
- // saves some memory on sites with very large forums
- $replies = forum_count_discussion_replies($forum->id, $sort, $maxdiscussions, $page, $perpage);
- } else {
- $replies = forum_count_discussion_replies($forum->id);
- }
-
- } else {
- $replies = forum_count_discussion_replies($forum->id);
-
- if ($maxdiscussions > 0 and $maxdiscussions <= count($discussions)) {
- $olddiscussionlink = true;
- }
- }
-
- $canviewparticipants = course_can_view_participants($context);
- $canviewhiddentimedposts = has_capability('mod/forum:viewhiddentimedposts', $context);
-
- $strdatestring = get_string('strftimerecentfull');
-
- // Check if the forum is tracked.
- if ($cantrack = forum_tp_can_track_forums($forum)) {
- $forumtracked = forum_tp_is_tracked($forum);
- } else {
- $forumtracked = false;
- }
-
- if ($forumtracked) {
- $unreads = forum_get_discussions_unread($cm);
- } else {
- $unreads = array();
- }
-
- if ($displayformat == 'header') {
- echo '';
- }
-
- if ($olddiscussionlink) {
- if ($forum->type == 'news') {
- $strolder = get_string('oldertopics', 'forum');
- } else {
- $strolder = get_string('olderdiscussions', 'forum');
- }
- echo '
-
{{#str}}discussthistopic, forum{{/str}} ({{discussionrepliescount}}{{#isreplyplural}}{{#str}}repliesmany, forum{{/str}}{{/isreplyplural}}{{^isreplyplural}}{{#str}}repliesone, forum{{/str}}{{/isreplyplural}})
-
{{create_discussion_link_text}}
diff --git a/mod/forum/templates/frontpage_news_discussion_list.mustache b/mod/forum/templates/frontpage_news_discussion_list.mustache
new file mode 100644
index 00000000000..ed1d27b1748
--- /dev/null
+++ b/mod/forum/templates/frontpage_news_discussion_list.mustache
@@ -0,0 +1,36 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see
.
+}}
+{{!
+ @template mod_forum/social_discussion_list
+
+ Template which defines a forum post for sending in a single-post HTML email.
+
+ Classes required for JS:
+ * none
+
+ Data attributes required for JS:
+ * none
+
+ Example context (json):
+ {
+ }
+}}
+{{< mod_forum/news_discussion_list }}
+ {{$discussion_create_text}}
+ {{#str}}addanewtopic, forum{{/str}}
+ {{/discussion_create_text}}
+{{/ mod_forum/news_discussion_list }}
diff --git a/mod/forum/templates/frontpage_social_discussion_list.mustache b/mod/forum/templates/frontpage_social_discussion_list.mustache
new file mode 100644
index 00000000000..5613ee6ce2b
--- /dev/null
+++ b/mod/forum/templates/frontpage_social_discussion_list.mustache
@@ -0,0 +1,42 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see
.
+}}
+{{!
+ @template mod_forum/frontpage_social_discussion_list
+
+ Template which defines a forum post for sending in a single-post HTML email.
+
+ Classes required for JS:
+ * none
+
+ Data attributes required for JS:
+ * none
+
+ Example context (json):
+ {
+ }
+}}
+{{< mod_forum/social_discussion_list }}
+ {{$discussion_create_text}}
+ {{#str}}addanewtopic, forum{{/str}}
+ {{/discussion_create_text}}
+ {{$discussion_top_pagination}}{{/discussion_top_pagination}}
+ {{$discussion_bottom_pagination}}
+ {{#hasmore}}
+
{{#str}}oldertopics, mod_forum{{/str}}...
+ {{/hasmore}}
+ {{/discussion_bottom_pagination}}
+{{/ mod_forum/social_discussion_list }}
diff --git a/mod/forum/templates/social_discussion_list.mustache b/mod/forum/templates/social_discussion_list.mustache
new file mode 100644
index 00000000000..fc24f190689
--- /dev/null
+++ b/mod/forum/templates/social_discussion_list.mustache
@@ -0,0 +1,48 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see
.
+}}
+{{!
+ @template mod_forum/social_discussion_list
+
+ Template which defines a forum post for sending in a single-post HTML email.
+
+ Classes required for JS:
+ * none
+
+ Data attributes required for JS:
+ * none
+
+ Example context (json):
+ {
+ }
+}}
+{{< mod_forum/discussion_list }}
+ {{$discussion_create_text}}
+ {{#str}}addanewdiscussion, forum{{/str}}
+ {{/discussion_create_text}}
+ {{$discussion_list_output}}
+ {{#posts}}
+ {{< mod_forum/forum_discussion_post }}
+ {{$footer}}
+
+
{{#str}}discussthistopic, forum{{/str}} ({{discussionrepliescount}}{{#isreplyplural}}{{#str}}repliesmany, forum{{/str}}{{/isreplyplural}}{{^isreplyplural}}{{#str}}repliesone, forum{{/str}}{{/isreplyplural}})
+
+ {{/footer}}
+ {{$replyoutput}}{{/replyoutput}}
+ {{/ mod_forum/forum_discussion_post }}
+ {{/posts}}
+ {{/discussion_list_output}}
+{{/ mod_forum/discussion_list }}
diff --git a/mod/forum/upgrade.txt b/mod/forum/upgrade.txt
index 3381c91e223..3f301ab2713 100644
--- a/mod/forum/upgrade.txt
+++ b/mod/forum/upgrade.txt
@@ -5,6 +5,7 @@ information provided here is intended especially for developers.
* Changed the forum discussion rendering to use templates rather than print functions.
* Added new forum entities, factories, exporters, renderers, and vaults in the local namespace to better encapsulate the forum data.
* Deprecated all of the forum_print_* functions in lib.php.
+ * The forum_print_latest_discussions function has been deprecated and will not be replaced.
=== 3.6 ===
* forum_print_post should be surrounded with calls to forum_print_post_start and forum_print_post_end to create the proper HTML structure for the post.
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 4de4e125e7f..7a9a38f9c67 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -45,9 +45,16 @@ if (!$cmid && !$forumid) {
print_error('missingparameter');
}
-$forum = $forumid ? $forumvault->get_from_id($forumid) : $forumvault->get_from_course_module_id($cmid);
-if (!$forum) {
- throw new \moodle_exception('Unable to find forum with id ' . $forumid);
+if ($cmid) {
+ $forum = $forumvault->get_from_course_module_id($cmid);
+ if (empty($forum)) {
+ throw new \moodle_exception('Unable to find forum with cmid ' . $cmid);
+ }
+} else {
+ $forum = $forumvault->get_from_id($forumid);
+ if (empty($forum)) {
+ throw new \moodle_exception('Unable to find forum with id ' . $forumid);
+ }
}
if (!empty($showall)) {