Changeset 12259

Timestamp:

Sep 29, 2011, 3:48:49 PM (13 years ago)

Author:

plg

Message:

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.

Location:

trunk/admin

Files:

• batch_manager.php (modified) (1 diff)
• include/functions.php (modified) (2 diffs)
• picture_modify.php (modified) (1 diff)

trunk/admin/batch_manager.php

@@ -388 +388 @@
   FROM '.TAGS_TABLE.'
 ;';
-$template->assign('tags', get_taglist($query));
+$template->assign('tags', get_taglist($query, false));
 
 // +-----------------------------------------------------------------------+

trunk/admin/include/functions.php

@@ -2072 +2072 @@
 }
 
-function get_taglist($query)
+function get_taglist($query, $only_user_language=true)
 {
   $result = pwg_query($query);
@@ -2079 +2079 @@
   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)

trunk/admin/picture_modify.php

@@ -242 +242 @@
   FROM '.TAGS_TABLE.'
 ;';
-$tags = get_taglist($query);
+$tags = get_taglist($query, false);
 
 // retrieving direct information about picture