From 16803c57e9808dd319214f9f0651de909dd0728a Mon Sep 17 00:00:00 2001
From: scyrma <scyrma>
Date: Mon, 25 Feb 2008 07:10:42 +0000
Subject: [PATCH] MDL-13636 - merge from 1.9

---
 tag/edit.php             | 3 +++
 tag/tag_autocomplete.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tag/edit.php b/tag/edit.php
index 79497dfdbf6..06de0b80e20 100644
--- 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 48109e098de..7eaefb9c454 100644
--- 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";
     }
 }