aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-04-06 15:18:54 +0000
committerpatdenice <patdenice@piwigo.org>2011-04-06 15:18:54 +0000
commit1ccf0d0a523ed234307b4a8b73431eacf162b752 (patch)
tree852090318b541829fb7e7b930638c7fa88710e34 /admin
parentb6ea1bbe4ed8c26e22c73496a49cf37f37b8d9a6 (diff)
merge r10110 from trunk to branch 2.2
bug:2251 Bug corrected for fcbkcomplete git-svn-id: http://piwigo.org/svn/branches/2.2@10111 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/include/functions.php2
-rw-r--r--admin/themes/default/template/batch_manager_global.tpl2
-rw-r--r--admin/themes/default/template/batch_manager_unit.tpl2
-rw-r--r--admin/themes/default/template/picture_modify.tpl2
4 files changed, 4 insertions, 4 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 1e1f1b454..f5afa9633 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -2109,7 +2109,7 @@ function get_fckb_taglist($query)
array_push(
$taglist,
array(
- 'caption' => $row['tag_name'],
+ 'key' => $row['tag_name'],
'value' => '~~'.$row['tag_id'].'~~',
)
);
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index a582b09d4..603877992 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -11,7 +11,7 @@
jQuery(document).ready(function() {
jQuery("#tags").fcbkcomplete({
json_url: "admin.php?fckb_tags=1",
- cache: false,
+ cache: true,
filter_case: false,
filter_hide: true,
firstselected: true,
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index 885348a7a..4a859160f 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -17,7 +17,7 @@ prefix = ", ";
jQuery(document).ready(function() {
$(tag_boxes_selector).fcbkcomplete({
json_url: "admin.php?fckb_tags=1",
- cache: false,
+ cache: true,
filter_case: false,
filter_hide: true,
firstselected: true,
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 5b47a554f..70bb90bcb 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -7,7 +7,7 @@
jQuery(document).ready(function() {
jQuery("#tags").fcbkcomplete({
json_url: "admin.php?fckb_tags=1",
- cache: false,
+ cache: true,
filter_case: false,
filter_hide: true,
firstselected: true,