Ignore:
Timestamp:
Nov 9, 2008, 3:36:24 PM (15 years ago)
Author:
grum
Message:

merge -c2850 from branch 2.0 to trunk

The exact copy of commit log in 2850.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/category_default.inc.php

    r2841 r2853  
    118118      'FILE_POSTED' => format_date($row['date_available'], 'mysql_datetime'),
    119119      'FILE_CREATED' => (empty($row['date_creation'])) ?
    120         '-': format_date($row['date_creation'], 'mysql_datetime'),
     120        '-': format_date($row['date_creation'], 'us'),
    121121      'FILE_DESC' => (empty($row['comment'])) ? '-' : $row['comment'],
    122122      'FILE_AUTHOR' => (empty($row['author'])) ? '-' : $row['author'],
     
    126126      'FILE_HEIGHT' => (empty($row['height'])) ? '-' : $row['height'],
    127127      'FILE_METADATE' => (empty($row['date_metadata_update'])) ?
    128         '-': format_date($row['date_metadata_update'], 'mysql_datetime'),
     128        '-': format_date($row['date_metadata_update'], 'us'),
    129129      'FILE_RATE' => (empty($row['rate'])) ? '-' : $row['rate'],
    130130      'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?
Note: See TracChangeset for help on using the changeset viewer.