Merged from 1.7

diff --git a/mod/forum/post.php b/mod/forum/post.php
index 4f8e98a300cea03e49cfe1c9ed8e215c46335814..4f5a22a8dd62e08d03559e3f619f1e3e07d928ff 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -690,7 +690,7 @@
     if (!empty($parent) && !forum_user_can_see_post($forum, $discussion, $post)) {
         error("You cannot reply to this post");
     }
-    if (empty($parent) && !forum_user_can_post_discussion($forum)) {
+    if (empty($parent) && empty($edit) && !forum_user_can_post_discussion($forum)) {
         error("You cannot start a new discussion in this forum");
     }