diff options
Diffstat (limited to 'admin/history.php')
| -rw-r--r-- | admin/history.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/admin/history.php b/admin/history.php index 76db53c59..8307d5e32 100644 --- a/admin/history.php +++ b/admin/history.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -164,7 +164,7 @@ INSERT INTO '.SEARCH_TABLE.' } else { - array_push($page['errors'], l10n('Empty query. No criteria has been entered.')); + $page['errors'][] = l10n('Empty query. No criteria has been entered.'); } } @@ -337,9 +337,14 @@ SELECT $query = ' SELECT id, - name + name, url_name FROM '.TAGS_TABLE; - $name_of_tag = simple_hash_from_query($query, 'id', 'name'); + $name_of_tag = array(); + $result = pwg_query($query); + while ($row=pwg_db_fetch_assoc($result)) + { + $name_of_tag[ $row['id'] ] = '<a href="'.make_index_url( array('tags'=>array($row))).'">'.trigger_event("render_tag_name", $row['name'], $row).'</a>'; + } } $i = 0; @@ -528,10 +533,7 @@ SELECT ), 'MEMBERS' => sprintf( l10n_dec('%d member', '%d members', $summary['nb_members']).': %s', - implode( - ', ', - $member_strings - ) + implode(', ', $member_strings) ), 'GUESTS' => l10n_dec( '%d guest', '%d guests', |