aboutsummaryrefslogtreecommitdiffstats
path: root/admin/picture_modify.php
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-05-25 09:00:46 +0000
committerpatdenice <patdenice@piwigo.org>2011-05-25 09:00:46 +0000
commitc9b7beb12f38890631ab12c8086b1bff28eed4a4 (patch)
tree7c90d91c8c4d5949abd9d6d378dc9c84680d3163 /admin/picture_modify.php
parent4c13229cd9c7ce6a8b2e93b922b1e2dbc9b9799c (diff)
Load tags for tokeninput directly in html page. Ajax is too slow.
git-svn-id: http://piwigo.org/svn/trunk@11039 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/picture_modify.php')
-rw-r--r--admin/picture_modify.php13
1 files changed, 11 insertions, 2 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 333bf3e88..97bff6e5e 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -166,7 +166,7 @@ if (isset($_POST['submit']) and count($page['errors']) == 0)
$tag_ids = array();
if (isset($_POST['tags']))
{
- $tag_ids = get_fckb_tag_ids($_POST['tags']);
+ $tag_ids = get_tag_ids($_POST['tags']);
}
set_tags($tag_ids, $_GET['image_id']);
@@ -233,7 +233,15 @@ SELECT
JOIN '.TAGS_TABLE.' AS t ON t.id = it.tag_id
WHERE image_id = '.$_GET['image_id'].'
;';
-$tags = get_fckb_taglist($query);
+$tag_selection = get_taglist($query);
+
+$query = '
+SELECT
+ id AS tag_id,
+ name AS tag_name
+ FROM '.TAGS_TABLE.'
+;';
+$tags = get_taglist($query);
// retrieving direct information about picture
$query = '
@@ -267,6 +275,7 @@ $admin_url_start.= isset($_GET['cat_id']) ? '&amp;cat_id='.$_GET['cat_id'] : '';
$template->assign(
array(
+ 'tag_selection' => $tag_selection,
'tags' => $tags,
'U_SYNC' => $admin_url_start.'&amp;sync_metadata=1',
'U_DELETE' => $admin_url_start.'&amp;delete=1&amp;pwg_token='.get_pwg_token(),