Removed capability mod/forum:viewforum. We will use moodle/course:viewhiddenactivitie...

diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php
index 0828dfc95e4eb26451e91a3c1a535af37c66e333..724a694543195a9223c98e6b4a35f9b49e03f0e9 100644 (file)
--- a/mod/forum/db/access.php
+++ b/mod/forum/db/access.php
@@ -33,20 +33,6 @@
 
 $mod_forum_capabilities = array(
 
-    'mod/forum:viewforum' => array(
-
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_MODULE,
-        'legacy' => array(
-            'guest' => CAP_ALLOW,
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'coursecreator' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-
     'mod/forum:viewdiscussion' => array(
 
         'captype' => 'read',

diff --git a/mod/forum/index.php b/mod/forum/index.php
index 39c12e90e885c2ccddea8b9b070371def28e0ab7..dbd892f2b371c40ed9252d27025813fd37f3f23b 100644 (file)
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -93,7 +93,7 @@
             $cm = get_coursemodule_from_instance("forum", $forum->id, $course->id);
             $context = get_context_instance(CONTEXT_MODULE, $cm->id);
             
-            if (!has_capability('mod/forum:viewforum', $context)) {
+            if (!has_capability('mod/forum:viewdiscussions', $context)) {
                 if (isset($forum->keyreference)) {
                     unset($learningforums[$forum->keyreference]);
                 }

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 8759e3001fb4944e0a46da832af2e5580c555f75..95bd34ff03b98ff8e43eb16cc829de2598e415a2 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1183,8 +1183,7 @@ function forum_get_readable_forums($userid, $courseid=0) {
                     $forum->accessallgroups = true;
                 }
                 
-                if (has_capability('mod/forum:viewforum', $forumcontext)
-                        && has_capability('mod/forum:viewdiscussion', $forumcontext)) {
+                if (has_capability('mod/forum:viewdiscussion', $forumcontext)) {
                     
                     $forum->viewhiddentimedposts
                         = has_capability('mod/forum:viewhiddentimedposts', $forumcontext);
@@ -4513,7 +4512,6 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(),
 
             // Create overrides for default student and guest roles (prevent).
             foreach ($studentroles as $studentrole) {
-                assign_capability('mod/forum:viewforum', CAP_PREVENT, $studentrole->id, $context->id);
                 assign_capability('mod/forum:viewdiscussion', CAP_PREVENT, $studentrole->id, $context->id);
                 assign_capability('mod/forum:viewhiddentimedposts', CAP_PREVENT, $studentrole->id, $context->id);
                 assign_capability('mod/forum:startdiscussion', CAP_PREVENT, $studentrole->id, $context->id);
@@ -4533,7 +4531,6 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(),
                 assign_capability('mod/forum:throttlingapplies', CAP_PREVENT, $studentrole->id, $context->id);
             }
             foreach ($guestroles as $guestrole) {
-                assign_capability('mod/forum:viewforum', CAP_PREVENT, $guestrole->id, $context->id);
                 assign_capability('mod/forum:viewdiscussion', CAP_PREVENT, $guestrole->id, $context->id);
                 assign_capability('mod/forum:viewhiddentimedposts', CAP_PREVENT, $guestrole->id, $context->id);
                 assign_capability('mod/forum:startdiscussion', CAP_PREVENT, $guestrole->id, $context->id);

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 5eac0fc9ac192e1f6c5b56744302228face7a15d..ad4c492e7058f4b1b99638232cd95965cc5acddf 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -78,7 +78,7 @@
         notice(get_string("activityiscurrentlyhidden"));
     }
     
-    if (!has_capability('mod/forum:viewforum', $context)) {
+    if (!has_capability('mod/forum:viewdiscussions', $context)) {
         notice(get_string('noviewdiscussionspermission', 'forum'));
     }