From: skodak <skodak>
Date: Tue, 19 Sep 2006 06:35:52 +0000 (+0000)
Subject: moodle/course:managemetacourse is now singular
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b79da3ac68dd11d1512f50d91061560c0e9c86ca;p=moodle.git

moodle/course:managemetacourse is now singular
---

diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php
index e268678afb..3070310315 100644
--- 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 8dc5a3b681..e32f37abc8 100644
--- 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 73e9ff9de4..275f1bd428 100644
--- 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 f641d260fd..cc6ebd843b 100644
--- 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 7bcf5b7c19..d0a943fd6c 100644
--- 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 459f2478f1..2f4a9980bf 100644
--- 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