adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge -c2850 from branch 2.0 to trunk

Browse Source 
The exact copy of commit log in 2850.

git-svn-id: http://piwigo.org/svn/trunk@2853 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
grum
2008-11-09 14:36:24 +00:00
parent 30e97931af
commit 0ebfbafa91
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/category_default.inc.php
+2 -2
View File
@@ -117,7 +117,7 @@ foreach ($pictures as $row)
'FILE_PATH' => $row['path'],
'FILE_POSTED' => format_date($row['date_available'], 'mysql_datetime'),
'FILE_CREATED' => (empty($row['date_creation'])) ?
'-': format_date($row['date_creation'], 'mysql_datetime'),
'-': format_date($row['date_creation'], 'us'),
'FILE_DESC' => (empty($row['comment'])) ? '-' : $row['comment'],
'FILE_AUTHOR' => (empty($row['author'])) ? '-' : $row['author'],
'FILE_HIT' => $row['hit'],
@@ -125,7 +125,7 @@ foreach ($pictures as $row)
'FILE_WIDTH' => (empty($row['width'])) ? '-' : $row['width'],
'FILE_HEIGHT' => (empty($row['height'])) ? '-' : $row['height'],
'FILE_METADATE' => (empty($row['date_metadata_update'])) ?
'-': format_date($row['date_metadata_update'], 'mysql_datetime'),
'-': format_date($row['date_metadata_update'], 'us'),
'FILE_RATE' => (empty($row['rate'])) ? '-' : $row['rate'],
'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?
true:false, /* lack of include/functions_picture.inc.php */