mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-09 10:13:00 +02:00
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user