From 569ede574f2db14d7359b42e1ccbf5772a4554fb Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Fri, 22 Jun 2007 08:46:16 +0000
Subject: #115139: Add centralized json handler (and send text/javascript
 content-type header).

---
 modules/taxonomy/taxonomy.module | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/taxonomy/taxonomy.module')

diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 17e169f8c..adc722559 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1506,12 +1506,12 @@ function taxonomy_autocomplete($vid, $string = '') {
 
   // Fetch last tag
   $last_string = trim(array_pop($array));
+  $matches = array();
   if ($last_string != '') {
     $result = db_query_range(db_rewrite_sql("SELECT t.tid, t.name FROM {term_data} t WHERE t.vid = %d AND LOWER(t.name) LIKE LOWER('%%%s%%')", 't', 'tid'), $vid, $last_string, 0, 10);
 
     $prefix = count($array) ? implode(', ', $array) .', ' : '';
 
-    $matches = array();
     while ($tag = db_fetch_object($result)) {
       $n = $tag->name;
       // Commas and quotes in terms are special cases, so encode 'em.
@@ -1520,9 +1520,9 @@ function taxonomy_autocomplete($vid, $string = '') {
       }
       $matches[$prefix . $n] = check_plain($tag->name);
     }
-    print drupal_to_js($matches);
-    exit();
   }
+
+  drupal_json($matches);
 }
 
 /**
-- 
cgit v1.2.3