Changeset 10111

Timestamp:

04/06/11 17:18:54 (2 years ago)

Author:

patdenice

Message:

merge r10110 from trunk to branch 2.2
bug:2251
Bug corrected for fcbkcomplete

Location:

branches/2.2

Files:

• . (modified) (1 prop)
• admin/include/functions.php (modified) (1 diff)
• admin/themes/default/template/batch_manager_global.tpl (modified) (1 diff)
• admin/themes/default/template/batch_manager_unit.tpl (modified) (1 diff)
• admin/themes/default/template/maintenance.tpl (modified) (1 prop)
• admin/themes/default/template/picture_modify.tpl (modified) (1 diff)

branches/2.2/admin/include/functions.php

@@ -2110 +2110 @@
       $taglist,
       array(
-        'caption' => $row['tag_name'],
+        'key' => $row['tag_name'],
         'value' => '~~'.$row['tag_id'].'~~',
         )

branches/2.2/admin/themes/default/template/batch_manager_global.tpl

@@ -12 +12 @@
   jQuery("#tags").fcbkcomplete({
     json_url: "admin.php?fckb_tags=1",
-    cache: false,
+    cache: true,
     filter_case: false,
     filter_hide: true,

branches/2.2/admin/themes/default/template/batch_manager_unit.tpl

@@ -18 +18 @@
         $(tag_boxes_selector).fcbkcomplete({
                 json_url: "admin.php?fckb_tags=1",
-                cache: false,
+                cache: true,
                 filter_case: false,
                 filter_hide: true,

branches/2.2/admin/themes/default/template/picture_modify.tpl

@@ -8 +8 @@
         jQuery("#tags").fcbkcomplete({
                 json_url: "admin.php?fckb_tags=1",
-                cache: false,
+                cache: true,
                 filter_case: false,
                 filter_hide: true,