merge r3122 from trunk

- removed second parameter $type from function format_date

git-svn-id: http://piwigo.org/svn/branches/2.0@3123 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 6 insertions, 10 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 0607f550a..1902acdac 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -569,12 +569,11 @@ INSERT INTO '.HISTORY_TABLE.'
 }
 
 // format_date returns a formatted date for display. The date given in
-// argument can be a unixdate (number of seconds since the 01.01.1970) or an
-// american format (2003-09-15). By option, you can show the time. The
-// output is internationalized.
+// argument must be an american format (2003-09-15). By option, you can show the time.
+// The output is internationalized.
 //
-// format_date( "2003-09-15", 'us', true ) -> "Monday 15 September 2003 21:52"
-function format_date($date, $type = 'us', $show_time = false)
+// format_date( "2003-09-15", true ) -> "Monday 15 September 2003 21:52"
+function format_date($date, $show_time = false)
 {
   global $lang;
 
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index 6c0ece4be..eb2cd710b 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -130,17 +130,14 @@ SELECT id,author,date,image_id,content
 
     while ($row = mysql_fetch_array($result))
     {
-      $tpl_comment = 
+      $tpl_comment =
         array(
           'AUTHOR' => trigger_event('render_comment_author',
             empty($row['author'])
             ? l10n('guest')
             : $row['author']),
 
-          'DATE' => format_date(
-            $row['date'],
-            'mysql_datetime',
-            true),
+          'DATE' => format_date( $row['date'], true),
 
           'CONTENT' => trigger_event('render_comment_content',$row['content']),
         );