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

This commit is contained in:
David Monllao 2018-09-25 12:18:54 +02:00
commit 9708b6e9b3

View file

@ -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;