"DATA MOD/MDL-18079, respect mod/data:comment capability when adding comments, merged...

diff --git a/mod/data/comment.php b/mod/data/comment.php
index 571efbfa6367d5ec98b05fe6714f7ba28240496a..413957e1528e1985e0d425802e6010383657b1ba 100755 (executable)
--- a/mod/data/comment.php
+++ b/mod/data/comment.php
@@ -28,8 +28,8 @@
     }
 
     require_login($course->id, false, $cm);
-
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    require_capability('mod/data:comment', $context);
 
     if ($commentid) {
         if (! $comment = $DB->get_record('data_comments', array('id'=>$commentid))) {

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 0bfbfb40c43c3c6fc39a69fc609f4ef08452a456..1c4833c5d6481bf40d00e8daf714535d8d7511ea 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1433,6 +1433,9 @@ function data_get_ratings($recordid, $sort="u.firstname ASC") {
 function data_print_comments($data, $record, $page=0, $mform=false) {
     global $CFG, $DB;
 
+    $cm = get_coursemodule_from_instance('data', $data->id);
+    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $cancomment = has_capability('mod/data:comment', $context);
     echo '<a name="comments"></a>';
 
     if ($comments = $DB->get_records('data_comments', array('recordid'=>$record->id))) {
@@ -1442,7 +1445,7 @@ function data_print_comments($data, $record, $page=0, $mform=false) {
         echo '<br />';
     }
 
-    if (!isloggedin() or isguest()) {
+    if (!isloggedin() or isguest() or !$cancomment) {
         return;
     }