From 347fb6e3213f2b8429b5fbfd4a850b16c56a282d Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 29 Sep 2011 13:48:49 +0000 Subject: bug 2449 fixed: in the "tags box" on batch manager and picture_modify, we should only display the tag in the current user language, not the tag in all available languages. git-svn-id: http://piwigo.org/svn/trunk@12259 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'admin/include') diff --git a/admin/include/functions.php b/admin/include/functions.php index 1d229eea3..4a67b5202 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -2071,14 +2071,14 @@ function get_active_menu($menu_page) return 0; } -function get_taglist($query) +function get_taglist($query, $only_user_language=true) { $result = pwg_query($query); $taglist = array(); while ($row = pwg_db_fetch_assoc($result)) { - if (preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['name'], $matches)) + if (!$only_user_language and preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['name'], $matches)) { foreach ($matches[2] as $tag_name) { -- cgit v1.2.3