MDL-14150 - Make tag:edit and tag:manage more distinct - related tags and description...

diff --git a/tag/edit.php b/tag/edit.php
index 3da6fc63324d25775816fb360b405c4064984184..1939f1aab4ded1033d91604846d1ba4e1a40d211 100644 (file)
--- a/tag/edit.php
+++ b/tag/edit.php
@@ -69,7 +69,7 @@ if ($tagnew = $tagform->get_data()) {
         }
     }
 
-    if (!has_capability('moodle/tag:manage', $systemcontext)) {
+    if (!has_capability('moodle/tag:manage', $systemcontext) && !has_capability('moodle/tag:edit', $systemcontext)) {
         unset($tagnew->name);
         unset($tagnew->rawname);
 
@@ -87,9 +87,11 @@ if ($tagnew = $tagform->get_data()) {
 
         $tagnew->timemodified = time();
 
-        // rename tag if needed
-        if (!tag_rename($tag->id, $tagnew->rawname)) {
-            print_error('Error updating tag record');
+        if (has_capability('moodle/tag:manage', $systemcontext)) {
+            // rename tag
+            if(!tag_rename($tag->id, $tagnew->rawname)) {
+                error('Error updating tag record');
+            }
         }
     
         //updated related tags

diff --git a/tag/locallib.php b/tag/locallib.php
index 934d3c8bc0f2bbf2ca8df4ee77d07c99bfd82308..2a274133c4747b5edc4ac52f5b529d95b795093a 100644 (file)
--- a/tag/locallib.php
+++ b/tag/locallib.php
@@ -177,13 +177,11 @@ function tag_print_management_box($tag_object, $return=false) {
         $links[] = '<a href="'. $CFG->wwwroot .'/tag/user.php?action=flaginappropriate&amp;sesskey='. sesskey() .'&amp;tag='. rawurlencode($tag_object->name) .'">'. get_string('flagasinappropriate', 'tag', rawurlencode($tagname)) .'</a>';
 
         // Edit tag: Only people with moodle/tag:edit capability who either have it as an interest or can manage tags
-        if (has_capability('moodle/tag:edit', $systemcontext) && 
-                (tag_record_tagged_with('user', $USER->id, $tag_object->name) || 
-                 has_capability('moodle/tag:manage', $systemcontext))) {
+        if (has_capability('moodle/tag:edit', $systemcontext) || 
+            has_capability('moodle/tag:manage', $systemcontext)) {
             $links[] = '<a href="'. $CFG->wwwroot .'/tag/edit.php?tag='. rawurlencode($tag_object->name) .'">'. get_string('edittag', 'tag') .'</a>';
         }
 
-
         $output .= implode(' | ', $links);
         $output .= print_box_end(true);
     }