aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2014-07-08 19:00:47 +0000
committermistic100 <mistic@piwigo.org>2014-07-08 19:00:47 +0000
commit9ff7ab03a8ec8c012fbfadff281901fc2881deb9 (patch)
tree66ab763562b26b88f60fef1008dabbc2976058d5
parent1efc0eb46047957e69a6c686286c4ee032f86431 (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 '')
-rw-r--r--admin/comments.php2
-rw-r--r--comments.php2
-rw-r--r--include/functions.inc.php2
-rw-r--r--include/picture_comment.inc.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/admin/comments.php b/admin/comments.php
index e00889d7a..7a5ec4642 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -201,7 +201,7 @@ while ($row = pwg_db_fetch_assoc($result))
'ID' => $row['id'],
'TN_SRC' => $thumb,
'AUTHOR' => trigger_change('render_comment_author', $author_name),
- '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']),
'IS_PENDING' => ('false' == $row['validated']),
)
diff --git a/comments.php b/comments.php
index d21b7bb83..c3c470256 100644
--- a/comments.php
+++ b/comments.php
@@ -485,7 +485,7 @@ SELECT *
'ALT' => $name,
'AUTHOR' => trigger_change('render_comment_author', $comment['author']),
'WEBSITE_URL' => $comment['website_url'],
- 'DATE'=>format_date($comment['date']).' '.substr($comment['date'],11,4),
+ 'DATE'=>format_date($comment['date'], array('day_name','day','month','year','time')),
'CONTENT'=>trigger_change('render_comment_content',$comment['content']),
);
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'],
);