moodle/course:managemetacourse is now singular

diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php
index e268678afb6e103447e33e5572961e17d31a9700..30703103158c43a896c083134dcaa3eb6133dce0 100644 (file)
--- a/blocks/admin/block_admin.php
+++ b/blocks/admin/block_admin.php
@@ -65,7 +65,7 @@ class block_admin extends block_list {
 
     /// Manage metacourses
         if ($course->metacourse) {
-            if (has_capability('moodle/course:managemetacourses', $context)) { 
+            if (has_capability('moodle/course:managemetacourse', $context)) { 
                 $strchildcourses = get_string('childcourses');
                 $this->content->items[]='<a href="importstudents.php?id='.$this->instance->pageid.'">'.$strchildcourses.'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/course.gif" alt="" />';

diff --git a/course/edit.php b/course/edit.php
index 8dc5a3b681c12201acc23a5f9ec3542a49a3d6b5..e32f37abc86881437053e6c7850bc34c7379dedd 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -34,7 +34,7 @@
             }
 
         } else {
-            $managers = count(get_users_by_capability($context, 'moodle/course:managemetacourses'));
+            $managers = count(get_users_by_capability($context, 'moodle/course:managemetacourse'));
             $participants = count(get_users_by_capability($context, 'moodle/course:view'));
             if ($participants > $managers) {
                 $disable_meta = get_string('metaalreadyhasenrolments');
@@ -147,7 +147,7 @@
                     add_to_log(SITEID, "course", "new", "view.php?id=$newcourseid", "$form->fullname (ID $newcourseid)")        ;
                     $context = get_context_instance(CONTEXT_COURSE, $newcourseid);
 
-                    if ($form->metacourse and has_capability('moodle/course:managemetacourses', $context)) { // Redirect users with metacourse capability to student import
+                    if ($form->metacourse and has_capability('moodle/course:managemetacourse', $context)) { // Redirect users with metacourse capability to student import
                         redirect($CFG->wwwroot."/course/importstudents.php?id=$newcourseid");
 
                     } else if (has_capability('moodle/role:assign', $context)) { // Redirect users with assign capability to assign users to different roles

diff --git a/course/importstudents.php b/course/importstudents.php
index 73e9ff9de425aed0298b892880bc9e3e5ff84901..275f1bd4280b74980edb72970369db0f91a0cb7f 100644 (file)
--- a/course/importstudents.php
+++ b/course/importstudents.php
@@ -25,7 +25,7 @@
 
     require_login($course->id);
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
-    require_capability('moodle/course:managemetacourses', $context);
+    require_capability('moodle/course:managemetacourse', $context);
 
     if (!$course->metacourse) {
         redirect("$CFG->wwwroot/course/view.php?id=$course->id");

diff --git a/lib/db/access.php b/lib/db/access.php
index f641d260fd79d2883b6219de1f39f09ba5147a1f..cc6ebd843bf2dba9da4dbbf5a6b7cace60b72610 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -614,7 +614,7 @@ $moodle_capabilities = array(
         )
     ),
     
-    'moodle/course:managemetacourses' => array(
+    'moodle/course:managemetacourse' => array(
     
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 7bcf5b7c1947f2f699e97a1098055319f6404b97..d0a943fd6c25dab44b8be4d14035c74eb57c2ee0 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1855,7 +1855,7 @@ function sync_metacourse($course) {
     }
     
     // always keep metacourse managers
-    if ($users = get_users_by_capability($context, 'moodle/course:managemetacourses')) {
+    if ($users = get_users_by_capability($context, 'moodle/course:managemetacourse')) {
         $managers = array_keys($users);
     } else {
         $managers = array();

diff --git a/version.php b/version.php
index 459f2478f185a7c075bf762df15bd38914e6eca2..2f4a9980bfa0e7ddbbdcfed95725c484fab60b93 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006091807;  // YYYYMMDD = date
+   $version = 2006091900;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name