diff options
author | plegall <plg@piwigo.org> | 2006-05-15 22:21:08 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2006-05-15 22:21:08 +0000 |
commit | 875a6b15c89f168e15faf74af9efe180e1bb909e (patch) | |
tree | 60fcc0084adac992019a1357224b267a71b2ac89 /admin/picture_modify.php | |
parent | a8e574e2b5d5f5c1c819d0050629c8c2267b06b7 (diff) |
merge -r1312:1313 from branch 1.6 to trunk (bug 373 fixed)
git-svn-id: http://piwigo.org/svn/trunk@1314 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | admin/picture_modify.php | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php index ac7310ddd..54bb45d69 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -198,6 +198,24 @@ $template->set_filenames( ) ); +$all_tags = get_all_tags(); + +if (count($all_tags) > 0) +{ + $tag_selection = get_html_tag_selection( + get_all_tags(), + 'tags', + $selected_tags + ); +} +else +{ + $tag_selection = + '<p>'. + l10n('No tag defined. Use Administration>Pictures>Tags'). + '</p>'; +} + $template->assign_vars( array( 'U_SYNC' => @@ -225,11 +243,7 @@ $template->assign_vars( 'CREATION_DATE' => $date, - 'TAG_SELECTION' => get_html_tag_selection( - get_all_tags(), - 'tags', - $selected_tags - ), + 'TAG_SELECTION' => $tag_selection, 'DESCRIPTION' => isset($_POST['description']) ? |