feature:2807 better fix for svn:28995

git-svn-id: http://piwigo.org/svn/trunk@29008 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-07-08 19:00:47 +00:00
parent 1efc0eb460
commit 9ff7ab03a8
4 changed files with 4 additions and 4 deletions

View File

@@ -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']),
)

View File

@@ -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']),
);

View File

@@ -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');
}

View File

@@ -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'],
);