diff options
author | rvelices <rv-github@modusoptimus.com> | 2009-02-04 02:42:17 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2009-02-04 02:42:17 +0000 |
commit | 52281b5f44f000ea3b10c32a7039a32669d0b47b (patch) | |
tree | 327dc0aed9a8174dfa61ff0a9b8f367c01598f68 /include/picture_comment.inc.php | |
parent | 9428613b2da6132ef507e92461535283d48ecdc1 (diff) |
merge r3122 from trunk
- removed second parameter $type from function format_date
git-svn-id: http://piwigo.org/svn/branches/2.0@3123 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/picture_comment.inc.php')
-rw-r--r-- | include/picture_comment.inc.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php index 6c0ece4be..eb2cd710b 100644 --- a/include/picture_comment.inc.php +++ b/include/picture_comment.inc.php @@ -130,17 +130,14 @@ SELECT id,author,date,image_id,content while ($row = mysql_fetch_array($result)) { - $tpl_comment = + $tpl_comment = array( 'AUTHOR' => trigger_event('render_comment_author', empty($row['author']) ? l10n('guest') : $row['author']), - 'DATE' => format_date( - $row['date'], - 'mysql_datetime', - true), + 'DATE' => format_date( $row['date'], true), 'CONTENT' => trigger_event('render_comment_content',$row['content']), ); |