From 347fb6e3213f2b8429b5fbfd4a850b16c56a282d Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
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/batch_manager.php     | 2 +-
 admin/include/functions.php | 4 ++--
 admin/picture_modify.php    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 34bbefeea..fae54f4ba 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -387,7 +387,7 @@ $query = '
 SELECT id, name
   FROM '.TAGS_TABLE.'
 ;';
-$template->assign('tags', get_taglist($query));
+$template->assign('tags', get_taglist($query, false));
 
 // +-----------------------------------------------------------------------+
 // |                         open specific mode                            |
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)
       {
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 7dd6fcbc5..fb39a16a6 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -241,7 +241,7 @@ SELECT
     name
   FROM '.TAGS_TABLE.'
 ;';
-$tags = get_taglist($query);
+$tags = get_taglist($query, false);
 
 // retrieving direct information about picture
 $query = '
-- 
cgit v1.2.3