adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 01:03:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r11211 from branch 2.2 to trunk

Browse Source 
bug:2321
Tag names must be escaped in tag input.

git-svn-id: http://piwigo.org/svn/trunk@11212 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-06-02 15:40:49 +00:00
parent b7d1fd414b
commit 9866699c77
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/template/batch_manager_global.tpl
+1 -1
View File
@@ -12,7 +12,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}',
admin/themes/default/template/batch_manager_unit.tpl
+1 -1
View File
@@ -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}',
admin/themes/default/template/picture_modify.tpl
+1 -1
View File
@@ -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}',