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
This commit is contained in:
rvelices
2009-02-13 13:02:20 +00:00
parent bd8b4f51bb
commit b77b4f0aba
9 changed files with 151 additions and 201 deletions
+2 -5
View File
@@ -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;