"FORUM/MDL-17709, replace p with div in forum summary, merged from 1.9"

diff --git a/mod/forum/view.php b/mod/forum/view.php
index ece0bb69b091f2e189242062cd75bc84c6b03447..0d5d42bcc309d516d7c1e33cc5b5c3357444c5cb 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -232,7 +232,9 @@
 
         case 'eachuser':
             if (!empty($forum->intro)) {
-                print_box(format_text($forum->intro), 'generalbox', 'intro');
+                $options = new stdclass;
+                $options->para = false;
+                print_box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
             }
             echo '<p class="mdl-align">';
             if (forum_user_can_post_discussion($forum, null, -1, $cm)) {
@@ -258,7 +260,9 @@
 
         default:
             if (!empty($forum->intro)) {
-                print_box(format_text($forum->intro), 'generalbox', 'intro');
+                $options = new stdclass;
+                $options->para = false;
+                print_box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
             }
             echo '<br />';
             if (!empty($showall)) {