From: toyomoyo <toyomoyo>
Date: Fri, 20 Oct 2006 07:01:51 +0000 (+0000)
Subject: merged fix for MDL-7106, glossary capability check
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=dc07b832982c75a28865677c5495cea2c2d58d61;p=moodle.git

merged fix for MDL-7106, glossary capability check
---

diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index accc444489..67054721e1 100644
--- a/mod/glossary/edit.php
+++ b/mod/glossary/edit.php
@@ -38,9 +38,12 @@ if ($CFG->dbtype == 'postgres7' ) {
         $lcase = 'lcase';
 }
 
-if (!$glossary->studentcanpost && !has_capability('mod/glossary:manageentries', $context)) {
-    error("You can't add/edit entries to this glossary!");
+if ($e) { // if entry is sepcified
+    require_capability('mod/glossary:manageentries', $context);
+} else { // new entry
+    require_capability('mod/glossary:write', $context);
 }
+
 if ( $confirm ) {
     $form = data_submitted();
     trusttext_after_edit($form->text, $context);