aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-02-27 23:24:53 +0000
committerrub <rub@piwigo.org>2007-02-27 23:24:53 +0000
commitfec44b7f888783afeb99f256a07cfcef185d2110 (patch)
tree23e2f27985c0b64afbbebb9dc603907db23a0bf2 /include
parentdca9bd094a4231ba931abac2af33119f2079601d (diff)
Missing one change flat_hint to mode_flat_hint
Review a little l10n_dec git-svn-id: http://piwigo.org/svn/trunk@1864 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/category_default.inc.php7
-rw-r--r--include/functions.inc.php14
2 files changed, 10 insertions, 11 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 1d8438d93..19a8d7633 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -103,8 +103,7 @@ foreach ($pictures as $row)
'CLASS' => 'thumbElmt',
)
);
- if ($user['show_nb_hits']
- and isset($page['category']))
+ if ($user['show_nb_hits'])
{
$template->assign_block_vars(
'thumbnails.line.thumbnail.nb_hits',
@@ -155,9 +154,7 @@ foreach ($pictures as $row)
);
}
- if ($user['show_nb_comments']
- and isset($page['category'])
- and $page['category']['commentable'])
+ if ($user['show_nb_comments'])
{
$query = '
SELECT COUNT(*) AS nb_comments
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 46651c284..6b44c81dc 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1012,12 +1012,14 @@ function l10n($key)
function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal)
{
global $lang_info;
- if ( $lang_info['zero_plural'] and $decimal == 0 )
- {
- return sprintf(l10n($plural_fmt_key), 0);
- }
- return sprintf(l10n(($decimal > 1 ? $plural_fmt_key :
- $singular_fmt_key)), $decimal);
+
+ return
+ sprintf(
+ l10n((
+ (($decimal > 1) or ($decimal == 0 and $lang_info['zero_plural']))
+ ? $plural_fmt_key
+ : $singular_fmt_key
+ )), $decimal);
}
/**