Ignore:
Timestamp:
May 16, 2006, 12:21:08 AM (18 years ago)
Author:
plg
Message:

merge -r1312:1313 from branch 1.6 to trunk (bug 373 fixed)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/element_set_unit.php

    r1119 r1314  
    225225    {
    226226      list($year,$month,$day) = array('','','');
     227    }
     228
     229    if (count($all_tags) > 0)
     230    {
     231      $tag_selection = get_html_tag_selection(
     232        $all_tags,
     233        'tags-'.$row['id'],
     234        $selected_tags
     235        );
     236    }
     237    else
     238    {
     239      $tag_selection =
     240        '<p>'.
     241        l10n('No tag defined. Use Administration>Pictures>Tags').
     242        '</p>';
    227243    }
    228244   
     
    244260        'DATE_CREATION_YEAR' => $year,
    245261       
    246         'TAG_SELECTION' => get_html_tag_selection(
    247           $all_tags,
    248           'tags-'.$row['id'],
    249           $selected_tags
    250           ),
     262        'TAG_SELECTION' => $tag_selection,
    251263        )
    252264      );
Note: See TracChangeset for help on using the changeset viewer.