diff options
author | mistic100 <mistic@piwigo.org> | 2014-07-08 19:00:47 +0000 |
---|---|---|
committer | mistic100 <mistic@piwigo.org> | 2014-07-08 19:00:47 +0000 |
commit | 9ff7ab03a8ec8c012fbfadff281901fc2881deb9 (patch) | |
tree | 66ab763562b26b88f60fef1008dabbc2976058d5 /include | |
parent | 1efc0eb46047957e69a6c686286c4ee032f86431 (diff) |
feature:2807 better fix for svn:28995
git-svn-id: http://piwigo.org/svn/trunk@29008 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r-- | include/functions.inc.php | 2 | ||||
-rw-r--r-- | include/picture_comment.inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php index cc6dae20c..52c4d418f 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -609,7 +609,7 @@ function format_date($original, $show=null, $format=null) return l10n('N/A'); } - if ($show === null) + if ($show === null || $show === true) { $show = array('day_name', 'day', 'month', 'year'); } diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php index 483223089..fd9a7b7fd 100644 --- a/include/picture_comment.inc.php +++ b/include/picture_comment.inc.php @@ -182,7 +182,7 @@ SELECT array( 'ID' => $row['id'], 'AUTHOR' => trigger_change('render_comment_author', $row['author']), - 'DATE' => format_date($row['date']).' '.substr($row['date'],11,4), + 'DATE' => format_date($row['date'], array('day_name','day','month','year','time')), 'CONTENT' => trigger_change('render_comment_content',$row['content']), 'WEBSITE_URL' => $row['website_url'], ); |