diff options
author | rvelices <rv-github@modusoptimus.com> | 2009-02-13 13:02:20 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2009-02-13 13:02:20 +0000 |
commit | b77b4f0aba107444ad5003d4c6e9b72cb348a6ca (patch) | |
tree | 02ffed73dbc2c052da0df1e8f9f69efa119a7f44 /include/category_default.inc.php | |
parent | bd8b4f51bb68178ea48db2cd55b1ea3a15c63c45 (diff) |
merge r3136 from trunk
- moved check upgrade feed code to admin/include/functions_upgrade.php
- refactored some code (shorter and somehow faster - but nothing revolutionary)
- decrease lost space in permalinks.tpl and hard coded column width (was illisible)
git-svn-id: http://piwigo.org/svn/branches/2.0@3137 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | include/category_default.inc.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php index 025adcc40..98e6250f1 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -134,8 +134,7 @@ foreach ($pictures as $row) } if ($conf['show_thumbnail_caption']) - { - // name of the picture + {// name of the picture if (isset($row['name']) and $row['name'] != '') { $name = $row['name']; @@ -166,9 +165,7 @@ foreach ($pictures as $row) if ( isset($nb_comments_of) ) { - $row['nb_comments'] = isset($nb_comments_of[$row['id']]) - ? (int)$nb_comments_of[$row['id']] : 0; - $tpl_var['NB_COMMENTS'] = $row['nb_comments']; + $tpl_var['NB_COMMENTS'] = (int)@$nb_comments_of[$row['id']]; } $tpl_thumbnails_var[] = $tpl_var; |