From b02bee229506b6c23a31d2e5345fecdadd1f7634 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Fri, 8 Apr 2011 13:52:16 +0000
Subject: merge r10162 from trunk to branch 2.2 bug:2251 Bug corrected for
 batch_manager_unit and picture_modify.

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

(limited to 'admin/themes/default')

diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index 4a859160f..12ff16957 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -106,7 +106,7 @@ jQuery(document).ready(function() {
 
 <select id="tags-{$element.ID}" name="tags-{$element.ID}">
 {foreach from=$element.TAGS item=tag}
-  <option value="{$tag.value}" class="selected">{$tag.caption}</option>
+  <option value="{$tag.value}" class="selected">{$tag.key}</option>
 {/foreach}
 </select>
 
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 70bb90bcb..438acb8a8 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -137,7 +137,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
         <td>
 <select id="tags" name="tags">
 {foreach from=$tags item=tag}
-  <option value="{$tag.value}" class="selected">{$tag.caption}</option>
+  <option value="{$tag.value}" class="selected">{$tag.key}</option>
 {/foreach}
 </select>
         </td>
-- 
cgit v1.2.3