MDL-13636 - merge from 1.9

diff --git a/tag/edit.php b/tag/edit.php
index 79497dfdbf6476eb59021c4d4d21253f3aed2be4..06de0b80e20f7256ce1c9ecdf8701c16cd0424b0 100644 (file)
--- a/tag/edit.php
+++ b/tag/edit.php
@@ -116,6 +116,9 @@ myAutoComp.delimChar = ",";
 myAutoComp.maxResultsDisplayed = 20;
 myAutoComp.minQueryLength = 2;
 myAutoComp.allowBrowserAutocomplete = false;
+myAutoComp.formatResult = function(aResultItem, sQuery) {
+    return aResultItem[1];
+}
 </script>
 
 <?php

diff --git a/tag/tag_autocomplete.php b/tag/tag_autocomplete.php
index 48109e098deb75ea27d58e37957bd990c3757af5..7eaefb9c454692300a7da97342f4e5115fbe7942 100644 (file)
--- a/tag/tag_autocomplete.php
+++ b/tag/tag_autocomplete.php
@@ -12,8 +12,8 @@ if (empty($CFG->usetags)) {
 $query = addslashes(optional_param('query', '', PARAM_RAW));  
 
 if ($similar_tags = tag_autocomplete($query)) {
-    foreach ($similar_tags as $tag){
-        echo tag_display_name($tag) . "\t" . $tag->id . "\n";
+    foreach ($similar_tags as $tag) {
+        echo html_entity_decode(tag_display_name($tag)) . "\t" . tag_display_name($tag) . "\n";
     }
 }