merged fix for MDL-7106, glossary capability check

diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index accc444489aaca1d471d23a309c8d7b1029ed95f..67054721e1b2ae2edf9b6c6657ef963251aa0a96 100644 (file)
--- 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);