MDL-13404 - merge from 1.9

diff --git a/tag/edit.php b/tag/edit.php
index 92f1cf6cc3219af726ecb808a7c1764ebbd9a66b..8a4bb8d213ce38d32feba24d1d0c65586bd92204 100644 (file)
--- a/tag/edit.php
+++ b/tag/edit.php
@@ -49,6 +49,7 @@ $tagform->set_data($tag);
 // If new data has been sent, update the tag record
 if ($tagnew = $tagform->get_data()) {
 
+    $do_update_name = false;
 
     if (!has_capability('moodle/tag:manage', $systemcontext)) {
         unset($tagnew->name);
@@ -64,6 +65,9 @@ if ($tagnew = $tagform->get_data()) {
         if ($tagold->name != $tagnew->name) {  // The name has changed, let's make sure it's not another existing tag
             if (tag_get_id($tagnew->name)) {   // Something exists already, so flag an error
                 $errorstring = s($tagnew->rawname).': '.get_string('namesalreadybeeingused', 'tag');
+            
+            } else {
+                $do_update_name = true;
             }
         }
     }
@@ -71,7 +75,8 @@ if ($tagnew = $tagform->get_data()) {
     if (empty($errorstring)) {    // All is OK, let's save it
         $tagnew->timemodified = time();
 
-        if (!update_record('tag', $tagnew)) {
+        // rename tag if needed
+        if ($do_update_name && !tag_rename($tag_id, $tagnew->rawname)) {
             error('Error updating tag record');
         }