From 5257aad873f71bb0125d8b576748c7bf1bf3163d Mon Sep 17 00:00:00 2001 From: mistic100 Date: Wed, 25 May 2011 13:33:29 +0000 Subject: bug:2278 fixed (merge r10970 r11008 r11039 from trunk) replace FCBKcomplete by TokenInput to avoid 3rd tag issue on autocomplete git-svn-id: http://piwigo.org/svn/branches/2.2@11056 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/picture_modify.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'admin/picture_modify.php') 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']) ? '&cat_id='.$_GET['cat_id'] : ''; $template->assign( array( + 'tag_selection' => $tag_selection, 'tags' => $tags, 'U_SYNC' => $admin_url_start.'&sync_metadata=1', 'U_DELETE' => $admin_url_start.'&delete=1&pwg_token='.get_pwg_token(), -- cgit v1.2.3