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
Piwigo · Nov 9, 2008 · 0ebfbaf · 0ebfbaf
1 parent 30e9793
commit 0ebfbaf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
@@ -117,15 +117,15 @@
       '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'],
       'FILE_SIZE' => (empty($row['filesize'])) ? '-' : $row['filesize'],
       '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 */