summaryrefslogtreecommitdiff
path: root/modules/tag
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2012-05-19 11:28:46 -0700
committerBharat Mediratta <bharat@menalto.com>2012-05-19 11:31:25 -0700
commita9be0691d9efd84cbf5a9f05236caf4df23bcfdb (patch)
tree2b5bcf6ecefb5e93d1f00cb450dd8625fcabfe23 /modules/tag
parent74fa9422db01fbc017ddbc847333cc7847f185ab (diff)
Create an ajax response framework that inserts <meta> tags to guard
against UTF-7, and create a $.gallery_autocomplete variant of jQuery's autocomplete that expects the first line to be a <meta> tag and discards it. More complete fix for #1871.
Diffstat (limited to 'modules/tag')
-rw-r--r--modules/tag/controllers/tags.php4
-rw-r--r--modules/tag/helpers/tag_event.php4
-rw-r--r--modules/tag/views/tag_block.html.php2
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index edb8c89b..9af3843e 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -57,9 +57,9 @@ class Tags_Controller extends Controller {
->limit($limit)
->find_all();
foreach ($tag_list as $tag) {
- $tags[] = $tag->name;
+ $tags[] = html::clean($tag->name);
}
- print implode("\n", $tags);
+ ajax::response(implode("\n", $tags));
}
}
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index d4f1c757..d2757219 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -72,7 +72,7 @@ class tag_event_Core {
$url = url::site("tags/autocomplete");
$form->script("")
->text("$('form input[name=tags]').ready(function() {
- $('form input[name=tags]').autocomplete(
+ $('form input[name=tags]').gallery_autocomplete(
'$url', {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1});
});");
@@ -123,7 +123,7 @@ class tag_event_Core {
$autocomplete_url = url::site("tags/autocomplete");
$group->script("")
->text("$('input[name=tags]')
- .autocomplete(
+ .gallery_autocomplete(
'$autocomplete_url',
{max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1}
)
diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index 98fa0d4f..d25b8dcb 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -2,7 +2,7 @@
<script type="text/javascript">
$("#g-add-tag-form").ready(function() {
var url = $("#g-tag-cloud-autocomplete-url").attr("href");
- $("#g-add-tag-form input:text").autocomplete(
+ $("#g-add-tag-form input:text").gallery_autocomplete(
url, {
max: 30,
multiple: true,