From 9cf4a7039773ca79651877dcbf321667de55e9d8 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Thu, 2 Jun 2011 15:39:24 +0000
Subject: bug:2321 Tag names must be escaped in tag input.

git-svn-id: http://piwigo.org/svn/branches/2.2@11211 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/batch_manager_global.tpl | 2 +-
 admin/themes/default/template/batch_manager_unit.tpl   | 2 +-
 admin/themes/default/template/picture_modify.tpl       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'admin')

diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index b01a120a1..58c941cbf 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -10,7 +10,7 @@
 {footer_script require='jquery.tokeninput'}
 jQuery(document).ready(function() {ldelim}
   jQuery("#tags").tokenInput(
-    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
+    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
     {ldelim}
       hintText: '{'Type in a search term'|@translate}',
       noResultsText: '{'No results'|@translate}',
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index 66b8b6b17..0e39013a9 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -16,7 +16,7 @@ prefix = ", ";
 
 jQuery(document).ready(function() {ldelim}
   jQuery(tag_boxes_selector).tokenInput(
-    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
+    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
     {ldelim}
       hintText: '{'Type in a search term'|@translate}',
       noResultsText: '{'No results'|@translate}',
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 8cc01c43a..c28afed83 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -6,7 +6,7 @@
 {footer_script require='jquery.tokeninput'}
 jQuery(document).ready(function() {ldelim}
   jQuery("#tags").tokenInput(
-    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
+    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
     {ldelim}
       hintText: '{'Type in a search term'|@translate}',
       noResultsText: '{'No results'|@translate}',
-- 
cgit v1.2.3