diff options
Diffstat (limited to 'search_rules.php')
| -rw-r--r-- | search_rules.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/search_rules.php b/search_rules.php index 1fe8a628d..34854d2e0 100644 --- a/search_rules.php +++ b/search_rules.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 | // +-----------------------------------------------------------------------+ @@ -77,9 +77,10 @@ else if (isset($search['fields']['allwords'])) { - $template->append( 'search_words', - sprintf( - l10n('searched words : %s'), + $template->append( + 'search_words', + l10n( + 'searched words : %s', join(', ', $search['fields']['allwords']['words']) ) ); @@ -103,10 +104,10 @@ SELECT name if (isset($search['fields']['author'])) { $template->append( - 'search_words', - sprintf( - l10n('author(s) : %s'), - join(', ', $search['fields']['author']['words']) + 'search_words', + l10n( + 'author(s) : %s', + join(', ', array_map('strip_tags', $search['fields']['author']['words'])) ) ); } @@ -137,7 +138,7 @@ SELECT id, uppercats, global_rank { while ($row = pwg_db_fetch_assoc($result)) { - array_push($categories, $row); + $categories[] = $row; } } usort($categories, 'global_rank_compare'); @@ -148,8 +149,7 @@ SELECT id, uppercats, global_rank 'search_categories', get_cat_display_name_cache( $category['uppercats'], - null, // no url on category names - false // no blank replacement + null // no url on category names ) ); } |