From a7e57cf852cdea395c5f6e75fdd82e3941383acb Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Mon, 7 Jul 2014 21:36:23 +0000
Subject: feature 2807: fix bugs on comments format_date

git-svn-id: http://piwigo.org/svn/trunk@28995 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/comments.php              | 6 +++---
 comments.php                    | 2 +-
 include/picture_comment.inc.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/comments.php b/admin/comments.php
index a30018260..e00889d7a 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -57,7 +57,7 @@ if (!empty($_POST))
   {
     include_once( PHPWG_ROOT_PATH .'include/functions_comment.inc.php' );
     check_input_parameter('comments', $_POST, true, PATTERN_ID);
-    
+
     if (isset($_POST['validate']))
     {
       validate_user_comment($_POST['comments']);
@@ -186,7 +186,7 @@ while ($row = pwg_db_fetch_assoc($result))
         'path'=>$row['path'],
         )
      );
-  if (empty($row['author_id'])) 
+  if (empty($row['author_id']))
   {
     $author_name = $row['author'];
   }
@@ -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'], true),
+      'DATE' => format_date($row['date']).' '.substr($row['date'],11,4),
       'CONTENT' => trigger_change('render_comment_content',$row['content']),
       'IS_PENDING' => ('false' == $row['validated']),
       )
diff --git a/comments.php b/comments.php
index 16c6fcff1..d21b7bb83 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'], true),
+      'DATE'=>format_date($comment['date']).' '.substr($comment['date'],11,4),
       'CONTENT'=>trigger_change('render_comment_content',$comment['content']),
       );
 
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index cd4eda724..483223089 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'], true),
+          'DATE' => format_date($row['date']).' '.substr($row['date'],11,4),
           'CONTENT' => trigger_change('render_comment_content',$row['content']),
           'WEBSITE_URL' => $row['website_url'],
         );
-- 
cgit v1.2.3