fixed group management in wiki

diff --git a/mod/wiki/db/access.php b/mod/wiki/db/access.php
index 2b673a41279ac96b0ff15c0aa338bf8228c69f3f..f480bef5f1b8969b6b78b0dac09916593702d07b 100644 (file)
--- a/mod/wiki/db/access.php
+++ b/mod/wiki/db/access.php
@@ -46,19 +46,5 @@ $mod_wiki_capabilities = array(
             'coursecreator' => CAP_PREVENT,
             'admin' => CAP_ALLOW
         )
-    ),
-
-    'mod/wiki:manageallgroups' => array(
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_MODULE,
-        'legacy' => array(
-            'guest' => CAP_PREVENT,
-            'student' => CAP_PREVENT,
-            'teacher' => CAP_PREVENT,
-            'editingteacher' => CAP_ALLOW,
-            'coursecreator' => CAP_PREVENT,
-            'admin' => CAP_ALLOW
-        )
     )
 );

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 5e2d6ae05586533eadefce881da3f4a451ea0058..9153a447121bb3cc437417beb211442c5f982055 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -31,7 +31,8 @@ function wiki_is_teacher($wiki, $userid=NULL) {
 }
 
 function wiki_is_teacheredit($wiki, $userid=NULL) {
-    return has_capability('mod/wiki:manageallgroups', wiki_context($wiki), $userid);
+    return has_capability('mod/wiki:manage', wiki_context($wiki), $userid)
+       and has_capability('moodle/site:accessallgroups', wiki_context($wiki), $userid);
 }
 
 function wiki_is_student($wiki, $userid=NULL) {

diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index b32b3718413c14be719527446b9d9f6dc8819f09..cb7b70f397b79006c6688e2aebb10e7311ce874d 100644 (file)
--- a/mod/wiki/version.php
+++ b/mod/wiki/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2006091201;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2006091202;  // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2006080900;  // The current module version (Date: YYYYMMDDXX)
 $module->cron     = 0;           // Period for cron to check this module (secs)