merge r3490 from branch 2.0 to trunk

Reverse of 3484




git-svn-id: http://piwigo.org/svn/trunk@3491 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
vdigital
2009-07-01 21:10:42 +00:00
parent 61955b7dfe
commit 1bc5573c64
+2 -6
View File
@@ -103,12 +103,11 @@ foreach ($pictures as $row)
),
array('start')
);
$tn_src = get_thumbnail_url($row);
list($tn_width, $tn_height, $tn_type) = @getimagesize($tn_src);
$tpl_var =
array(
'ID' => $row['id'],
'TN_SRC' => $tn_src,
'TN_SRC' => get_thumbnail_url($row),
'TN_ALT' => $row['file'],
'TN_TITLE' => get_thumbnail_title($row),
'icon_ts' => get_icon($row['date_available']),
@@ -127,9 +126,6 @@ foreach ($pictures as $row)
'FILE_METADATE' => $row['date_metadata_update'],
'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?
true:false, /* lack of include/functions_picture.inc.php */
'FILE_TN_WIDTH' => $tn_width,
'FILE_TN_HEIGHT' => $tn_height,
'FILE_TN_TYPE' => $tn_type,
);
if ($user['show_nb_hits'])