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

8 files changed, 13 insertions, 19 deletions

diff --git a/admin/comments.php b/admin/comments.php
index f362f4043..bbd616982 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -139,7 +139,7 @@ SELECT c.id, c.image_id, c.date, c.author, c.content, i.path, i.tn_ext
     INNER JOIN '.IMAGES_TABLE.' AS i
       ON i.id = c.image_id
   WHERE validated = \'false\'
-  ORDER BY c.date DESC  
+  ORDER BY c.date DESC
 ;';
 $result = pwg_query($query);
 while ($row = mysql_fetch_assoc($result))
@@ -160,7 +160,7 @@ while ($row = mysql_fetch_assoc($result))
       'ID' => $row['id'],
       'TN_SRC' => $thumb,
       'AUTHOR' => trigger_event('render_comment_author', $row['author']),
-      'DATE' => format_date($row['date'],'mysql_datetime',true),
+      'DATE' => format_date($row['date'], true),
       'CONTENT' => trigger_event('render_comment_content',$row['content'])
       )
     );
diff --git a/admin/intro.php b/admin/intro.php
index fe87a1dc1..254896878 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -221,7 +221,7 @@ SELECT MIN(date_available)
       'DB_DATE' =>
       sprintf(
         l10n('first element added on %s'),
-        format_date($first_date, 'mysql_datetime')
+        format_date($first_date)
         )
       )
     );
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 6b665e1b0..9e7c063f5 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -241,8 +241,7 @@ $template->assign(
 
     'FILESIZE' => @$row['filesize'].' KB',
 
-    'REGISTRATION_DATE' =>
-      format_date($row['date_available'], 'mysql_datetime', false),
+    'REGISTRATION_DATE' => format_date($row['date_available']),
 
     'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],
 
diff --git a/comments.php b/comments.php
index 3ec5f273d..3b637e7f8 100644
--- a/comments.php
+++ b/comments.php
@@ -364,7 +364,7 @@ SELECT id, name, permalink, uppercats
         'TN_SRC' => $thumbnail_src,
         'ALT' => $name,
         'AUTHOR' => trigger_event('render_comment_author', $author),
-        'DATE'=>format_date($comment['date'],'mysql_datetime',true),
+        'DATE'=>format_date($comment['date'], true),
         'CONTENT'=>trigger_event('render_comment_content',$comment['content']),
         );
 
diff --git a/feed.php b/feed.php
index 64d2b0dcf..bbd4956f5 100644
--- a/feed.php
+++ b/feed.php
@@ -122,8 +122,7 @@ if (!$image_only)
   if (count($news) > 0)
   {
     $item = new FeedItem();
-    $item->title = sprintf(l10n('New on %s'),
-        format_date($dbnow, 'mysql_datetime') );
+    $item->title = sprintf(l10n('New on %s'), format_date($dbnow) );
     $item->link = $conf['gallery_url'];
 
     // content creation
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']),
         );
diff --git a/picture.php b/picture.php
index d44effad9..28e11e3e3 100644
--- a/picture.php
+++ b/picture.php
@@ -813,7 +813,7 @@ if (!empty($picture['current']['date_creation']))
 }
 
 // date of availability
-$val = format_date($picture['current']['date_available'], 'mysql_datetime');
+$val = format_date($picture['current']['date_available']);
 $url = make_index_url(
   array(
     'chronology_field'=>'posted',