From 2d14e8a8fe0df469c5c1e1ce5cbe5d937231a46d Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Thu, 28 Sep 2006 07:17:39 +0000
Subject: [PATCH] Removed duplicate capability moodle/course:managequestions   
 MDL-6610

---
 blocks/admin/block_admin.php |  2 +-
 lang/en_utf8/role.php        |  1 -
 lib/db/access.php            | 16 ----------------
 question/editlib.php         |  2 +-
 question/import.php          |  2 +-
 question/type/rqp/types.php  |  2 +-
 6 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php
index 46001a8c13..c6e4dc8793 100644
--- a/blocks/admin/block_admin.php
+++ b/blocks/admin/block_admin.php
@@ -117,7 +117,7 @@ class block_admin extends block_list {
         }
         
     /// Manage questions
-        if (has_capability('moodle/course:managequestions', $context)) {
+        if (has_capability('moodle/question:manage', $context)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/question/edit.php?courseid='.$this->instance->pageid.'&amp;clean=true">'.get_string('questions', 'quiz').'</a>';
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/questions.gif" alt="" />';
         }
diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 3c627c6fae..1a1593a848 100644
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -102,7 +102,6 @@ $string['course:managescales'] = 'Manage scales';
 $string['course:managegroups'] = 'Manage groups';
 $string['course:managefiles'] = 'Manage files';
 $string['course:managemetacourse'] = 'Manage metacourse';
-$string['course:managequestions'] = 'Manage questions';
 $string['course:reset'] = 'Reset course';
 $string['course:sectionvisibility'] = 'Control section visibility';
 $string['course:viewhiddensections'] = 'View hidden sections';
diff --git a/lib/db/access.php b/lib/db/access.php
index f93a776b69..15bf87517a 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -629,22 +629,6 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/course:managequestions' => array(
-
-        'riskbitmask' => RISK_XSS,
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'guest' => CAP_PREVENT,
-            'student' => CAP_PREVENT,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'coursecreator' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-
     'moodle/course:manageactivities' => array(
 
         'riskbitmask' => RISK_XSS,
diff --git a/question/editlib.php b/question/editlib.php
index d33ac891ac..543028cbb9 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -106,7 +106,7 @@ function question_category_menu($courseid, $published=false) {
         $publish = "OR publish = '1'";
     }
 
-    if (!has_capability('moodle/course:managequestions', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (!has_capability('moodle/question:manage', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
         $categories = get_records_select("question_categories", "course = '$courseid' $publish", 'parent, sortorder, name ASC');
     } else {
         $categories = get_records_select("question_categories", '', 'parent, sortorder, name ASC');
diff --git a/question/import.php b/question/import.php
index 4b615a2823..0ec1eaf54a 100644
--- a/question/import.php
+++ b/question/import.php
@@ -183,7 +183,7 @@
     print_heading_with_help($txt->importquestions, "import", "quiz");
 
     /// Get all the existing categories now
-    if (has_capability('moodle/course:managequestions', get_context_instance(CONTEXT_SYSTEM, SITEID))) { // the admin can import into all categories
+    if (has_capability('moodle/question:manage', get_context_instance(CONTEXT_SYSTEM, SITEID))) { // the admin can import into all categories
         if (!$categories = get_records_select("question_categories", "course = '{$course->id}' OR publish = '1'", "parent, sortorder, name ASC")) {
             error("Could not find any question categories!"); // Something is really wrong
         }
diff --git a/question/type/rqp/types.php b/question/type/rqp/types.php
index 4b26ed2dd2..3ca4ce7d76 100644
--- a/question/type/rqp/types.php
+++ b/question/type/rqp/types.php
@@ -13,7 +13,7 @@
 
     // Check user admin
     require_login();
-    require_capability('moodle/course:managequestions', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/question:manage', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     if (!$site = get_site()) {
         error('Site isn\'t defined!');
-- 
2.39.5