Merging from STABLE:

Fix for bug 3467: Adding "single discussion forum" was broken. Now works.
This commit is contained in:
defacer 2005-06-14 15:52:49 +00:00
parent 7168423c82
commit 93c865201a
2 changed files with 3 additions and 1 deletions

View File

@ -111,8 +111,9 @@ function forum_add_instance($forum) {
$discussion->name = $forum->name;
$discussion->intro = $forum->intro;
$discussion->assessed = $forum->assessed;
$discussion->format = $forum->format;
if (! forum_add_discussion($discussion)) {
if (! forum_add_discussion($discussion, $discussion->intro)) {
error('Could not add the discussion for this forum');
}
}

View File

@ -295,6 +295,7 @@
<input type="hidden" name="modulename" value="<?php p($form->modulename) ?>" />
<input type="hidden" name="instance" value="<?php p($form->instance) ?>" />
<input type="hidden" name="mode" value="<?php p($form->mode) ?>" />
<input type="hidden" name="format" value="<?php echo $defaultformat; ?>" />
<input type="submit" value="<?php print_string("savechanges") ?>" />
<input type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
</center>