Permalink
Browse files

Merge branch 'MDL-62717-35' of https://github.com/lucaboesch/moodle i…

…nto MOODLE_35_STABLE
  • Loading branch information...
dmonllao committed Sep 25, 2018
2 parents 16c5c24 + a93eb11 commit 9708b6e9b3f47a7421a2ea7e5cc893e09264e6b5
Showing with 3 additions and 0 deletions.
  1. +3 −0 mod/forum/lib.php
@@ -3051,6 +3051,7 @@ function forum_get_course_forum($courseid, $type) {
case "news":
$forum->name = get_string("namenews", "forum");
$forum->intro = get_string("intronews", "forum");
$forum->introformat = FORMAT_HTML;
$forum->forcesubscribe = FORUM_FORCESUBSCRIBE;
$forum->assessed = 0;
if ($courseid == SITEID) {
@@ -3061,12 +3062,14 @@ function forum_get_course_forum($courseid, $type) {
case "social":
$forum->name = get_string("namesocial", "forum");
$forum->intro = get_string("introsocial", "forum");
$forum->introformat = FORMAT_HTML;
$forum->assessed = 0;
$forum->forcesubscribe = 0;
break;
case "blog":
$forum->name = get_string('blogforum', 'forum');
$forum->intro = get_string('introblog', 'forum');
$forum->introformat = FORMAT_HTML;
$forum->assessed = 0;
$forum->forcesubscribe = 0;
break;

0 comments on commit 9708b6e

Please sign in to comment.