diff options
| author | patdenice <patdenice@piwigo.org> | 2011-06-02 15:40:49 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-06-02 15:40:49 +0000 |
| commit | 9866699c7786c27f65aff681388aeb5deac05e87 (patch) | |
| tree | 249e7f71e85e5258402e5746fcfed5169639a1d5 | |
| parent | b7d1fd414b40c009c7c33ea992fff8494e13a3d8 (diff) | |
merge r11211 from branch 2.2 to trunk
bug:2321
Tag names must be escaped in tag input.
git-svn-id: http://piwigo.org/svn/trunk@11212 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/themes/default/template/batch_manager_global.tpl | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/batch_manager_unit.tpl | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/picture_modify.tpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index f645b3f53..3f283e70e 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -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}', 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}', |