diff options
| author | rvelices <rv-github@modusoptimus.com> | 2007-10-08 23:13:56 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2007-10-08 23:13:56 +0000 |
| commit | a15cc194b98bf25dc67a9009b0ee2c0f63671642 (patch) | |
| tree | e78cb90a11a78d191499eb01d1d9b61e63be9d47 /include/category_default.inc.php | |
| parent | d446a221cde74616db3715f665b0ee7210cb133c (diff) | |
merge revisions 2121, 2122 and 2123 from trunk to branch-1_7
- function str2url is compatible with utf-8
- removed some old code (useless)
- remove str_translate_to_ascii7bits and lang_table_translate_ascii7bits
- mail subject and address names can contain accentuated characters
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2125 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/category_default.inc.php')
| -rw-r--r-- | include/category_default.inc.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php index fd6bd9684..a1654e396 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -105,7 +105,7 @@ foreach ($pictures as $row) 'CLASS'=> set_span_class($row['hit']) . ' nb-hits', ) ); - + } if ($conf['show_thumbnail_caption']) @@ -134,11 +134,6 @@ foreach ($pictures as $row) } break; } - case 'search' : - { - $name = replace_search($name, $page['search']); - break; - } } $template->assign_block_vars( @@ -161,7 +156,7 @@ SELECT COUNT(*) AS nb_comments $template->assign_block_vars( 'thumbnails.line.thumbnail.nb_comments', array( - 'NB_COMMENTS'=> l10n_dec('%d comment', '%d comments', + 'NB_COMMENTS'=> l10n_dec('%d comment', '%d comments', $row['nb_comments']), 'CLASS'=> set_span_class($row['nb_comments']) . ' nb-comments', ) |