MDL-11301 tag autocomplete on edit page works again

diff --git a/tag/edit.php b/tag/edit.php
index f38cef8019f896d3353e89e755d4034961afe058..ca71353e4420c9700a3834d38e22e8a99a7cd4d7 100644 (file)
--- a/tag/edit.php
+++ b/tag/edit.php
@@ -5,22 +5,25 @@ require_once('lib.php');
 require_once('edit_form.php');
 require_once($CFG->dirroot.'/lib/weblib.php');
 
+require_js(array('yui_dom-event', 'yui_connection', 'yui_animation', 'yui_autocomplete'));
+
 require_login();
 
-if( empty($CFG->usetags)) {
+if (empty($CFG->usetags)) {
     error(get_string('tagsaredisabled', 'tag'));
 }
 
-$tagid    = required_param('id', PARAM_INT);   // user id
-$tag      = tag_by_id($tagid);
-$tagname  = tag_display_name($tag);
+$tagid   = required_param('id', PARAM_INT);   // user id
+
+$tag     = tag_by_id($tagid);
+$tagname = tag_display_name($tag);
 
 //Editing a tag requires moodle/tag:edit capability
 $systemcontext   = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/tag:edit', $systemcontext);
 
 // set the relatedtags field of the $tag object that will be passed to the form
-$tag->relatedtags = tag_names_csv( get_item_tags('tag',$tagid) );
+$tag->relatedtags = tag_names_csv(get_item_tags('tag',$tagid));
 
 $tagform = new tag_edit_form();
 $tagform->set_data($tag);
@@ -52,12 +55,7 @@ print_heading($tagname, '', 2);
 
 $tagform->display();
 
-
-echo require_js('yui_dom-event');
-echo require_js('yui_connection');
-echo require_js('yui_animation');
-echo require_js('yui_autocomplete');
-
+if (ajaxenabled()) {
 ?>
 
 <script type="text/javascript">
@@ -77,7 +75,7 @@ myAutoComp.allowBrowserAutocomplete = false;
 </script>
 
 <?php
-
+}
 print_footer();
 
 ?>

diff --git a/tag/lib.php b/tag/lib.php
index f234db58d9ba56b4afcfbfe96e1e702cfaacc542..9e354d9751fe607aa7a724f095a7d456c6c44ec5 100644 (file)
--- a/tag/lib.php
+++ b/tag/lib.php
@@ -737,21 +737,13 @@ function search_tags($text, $ordered=true, $limitfrom='' , $limitnum='' ) {
  * @return mixed an array of objects, or false if no records were found or an error occured.
  */
 function similar_tags($text, $limitfrom='' , $limitnum='' ) {
-
     global $CFG;
 
-    $text = tag_normalize($text);
+    $text = moodle_strtolower($text);
 
-    $query = "
-        SELECT 
-            tg.id, tg.name, tg.rawname
-        FROM
-            {$CFG->prefix}tag tg
-        WHERE
-            tg.name
-        LIKE
-            '{$text}%'
-        ";
+    $query = "SELECT tg.id, tg.name, tg.rawname
+                FROM {$CFG->prefix}tag tg
+               WHERE tg.name LIKE '{$text}%'";
 
     return get_records_sql($query, $limitfrom , $limitnum);
 }

diff --git a/tag/tag_autocomplete.php b/tag/tag_autocomplete.php
index c3daab8070870250806d1185c72d0df511dbda0c..abcecd3cb9b28ab332b147f9a4d77eef356bb1d4 100644 (file)
--- a/tag/tag_autocomplete.php
+++ b/tag/tag_autocomplete.php
@@ -1,19 +1,20 @@
 <?php // $Id$
 
+require_once('../config.php');
 require_once('lib.php');
 
-if( empty($CFG->usetags)) {
+require_login();
+
+if (empty($CFG->usetags)) {
     error(get_string('tagsaredisabled', 'tag'));
 }
 
-$query    = optional_param('query',     0,      PARAM_TEXT);  
-$query    = tag_normalize($query);
-
-$similar_tags = similar_tags($query);
+$query = optional_param('query', '', PARAM_TAG);  
 
-$count = 0;
-foreach ($similar_tags as $tag){
-    echo tag_display_name($tag) . "\t" . $tag->id . "\n";
+if ($similar_tags = similar_tags($query)) {
+    foreach ($similar_tags as $tag){
+        echo tag_display_name($tag) . "\t" . $tag->id . "\n";
+    }
 }
 
 ?>