Changeset 12259


Ignore:
Timestamp:
Sep 29, 2011, 3:48:49 PM (9 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/batch_manager.php

    r11853 r12259  
    388388  FROM '.TAGS_TABLE.'
    389389;';
    390 $template->assign('tags', get_taglist($query));
     390$template->assign('tags', get_taglist($query, false));
    391391
    392392// +-----------------------------------------------------------------------+
  • trunk/admin/include/functions.php

    r12032 r12259  
    20722072}
    20732073
    2074 function get_taglist($query)
     2074function get_taglist($query, $only_user_language=true)
    20752075{
    20762076  $result = pwg_query($query);
     
    20792079  while ($row = pwg_db_fetch_assoc($result))
    20802080  {
    2081     if (preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['name'], $matches))
     2081    if (!$only_user_language and preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['name'], $matches))
    20822082    {
    20832083      foreach ($matches[2] as $tag_name)
  • trunk/admin/picture_modify.php

    r11853 r12259  
    242242  FROM '.TAGS_TABLE.'
    243243;';
    244 $tags = get_taglist($query);
     244$tags = get_taglist($query, false);
    245245
    246246// retrieving direct information about picture
Note: See TracChangeset for help on using the changeset viewer.