archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature:2807 better fix for svn:28995

Browse source 
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
commit 9ff7ab03a8
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/comments.php
View file

@ -201,7 +201,7 @@ while ($row = pwg_db_fetch_assoc($result))
'ID' => $row['id'], 'ID' => $row['id'],
'TN_SRC' => $thumb, 'TN_SRC' => $thumb,
'AUTHOR' => trigger_change('render_comment_author', $author_name), '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']), 'CONTENT' => trigger_change('render_comment_content',$row['content']),
'IS_PENDING' => ('false' == $row['validated']), 'IS_PENDING' => ('false' == $row['validated']),
) )

2
comments.php
View file

@ -485,7 +485,7 @@ SELECT *
'ALT' => $name, 'ALT' => $name,
'AUTHOR' => trigger_change('render_comment_author', $comment['author']), 'AUTHOR' => trigger_change('render_comment_author', $comment['author']),
'WEBSITE_URL' => $comment['website_url'], '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']), 'CONTENT'=>trigger_change('render_comment_content',$comment['content']),
); );

2
include/functions.inc.php
View file

@ -609,7 +609,7 @@ function format_date($original, $show=null, $format=null)
return l10n('N/A'); return l10n('N/A');
} }
if ($show === null) if ($show === null || $show === true)
{ {
$show = array('day_name', 'day', 'month', 'year'); $show = array('day_name', 'day', 'month', 'year');
} }

2
include/picture_comment.inc.php
View file

@ -182,7 +182,7 @@ SELECT
array( array(
'ID' => $row['id'], 'ID' => $row['id'],
'AUTHOR' => trigger_change('render_comment_author', $row['author']), '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']), 'CONTENT' => trigger_change('render_comment_content',$row['content']),
'WEBSITE_URL' => $row['website_url'], 'WEBSITE_URL' => $row['website_url'],
); );