Merge branch 'MDL-62717-master' of https://github.com/lucaboesch/moodle

moodle · Sep 25, 2018 · 9d4c8d45ef5a687c5137eb78d3e6a964808d3647 · 9d4c8d4
2 parents 85d4b77 + 490476a
commit 9d4c8d45ef5a687c5137eb78d3e6a964808d3647
Unified Split

Showing with 3 additions and 0 deletions.

+3 −0 mod/forum/lib.php
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
@@ -3050,6 +3050,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) {
@@ -3060,12 +3061,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;