From: sam_marshall <sam_marshall>
Date: Mon, 19 Jan 2009 14:20:36 +0000 (+0000)
Subject: MDL-17965: Prevent forum move to forum you can't start discussions in
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ee8d825f70bfebf2a6736eeb8d289845c2e07842;p=moodle.git

MDL-17965: Prevent forum move to forum you can't start discussions in
---

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 46ef0ec7f6..0c5bb0f583 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -70,6 +70,9 @@
             print_error('cannotmovenotvisible', 'forum', $return);
         }
 
+        require_capability('mod/forum:startdiscussion',
+            get_context_instance(CONTEXT_MODULE,$cmto->id));
+
         if (!forum_move_attachments($discussion, $forum->id, $forumto->id)) {
             notify("Errors occurred while moving attachment directories - check your file permissions");
         }
@@ -191,7 +194,8 @@
             $section = -1;
             $forummenu = array();
             foreach ($modinfo->instances['forum'] as $forumcm) {
-                if (!$forumcm->uservisible) {
+                if (!$forumcm->uservisible || !has_capability('mod/forum:startdiscussion',
+                    get_context_instance(CONTEXT_MODULE,$forumcm->id))) {
                     continue;
                 }