MDL-16514 - adding format to forum mod_form and fixing regression in single forum...

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 6b3923c28e24667b9582ad733d823687ac7de964..0b78cccbec28e774abc9dcc5b266d6a63fe67a11 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -70,7 +70,7 @@ function forum_add_instance($forum) {
         $discussion->name     = $forum->name;
         $discussion->intro    = $forum->intro;
         $discussion->assessed = $forum->assessed;
-        $discussion->format   = $forum->type;
+        $discussion->format   = $forum->format;
         $discussion->mailnow  = false;
         $discussion->groupid  = -1;
 

diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php
index fa5f6f4f745e8aa9e382488e976803aa4a11c8c4..59cde393d059b5dfed224cd30f392f68a505bf05 100644 (file)
--- a/mod/forum/mod_form.php
+++ b/mod/forum/mod_form.php
@@ -32,6 +32,8 @@ class mod_forum_mod_form extends moodleform_mod {
         $mform->addRule('intro', get_string('required'), 'required', null, 'client');
         $mform->setHelpButton('intro', array('writing', 'questions', 'richtext'), false, 'editorhelpbutton');
 
+        $mform->addElement('format', 'format', get_string('format'));
+
         $options = array();
         $options[0] = get_string('no');
         $options[1] = get_string('yesforever', 'forum');