aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgrum <grum@piwigo.org>2008-11-09 14:36:24 +0000
committergrum <grum@piwigo.org>2008-11-09 14:36:24 +0000
commit0ebfbafa91d703e17f6e1a4f9d8711150733317f (patch)
treed0cd131607a1732dadeb74803593d305b941f396 /include
parent30e97931afa292620ed7cfc31f29080d572923f1 (diff)
merge -c2850 from branch 2.0 to trunk
The exact copy of commit log in 2850. git-svn-id: http://piwigo.org/svn/trunk@2853 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/category_default.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index b46b8465c..02f8afd39 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -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 */