Changeset 3123

Timestamp:

Feb 4, 2009, 3:42:17 AM (16 years ago)

Author:

rvelices

Message:

merge r3122 from trunk

• removed second parameter $type from function format_date

Location:

branches/2.0

Files:

• admin/comments.php (modified) (2 diffs)
• admin/intro.php (modified) (1 diff)
• admin/picture_modify.php (modified) (1 diff)
• comments.php (modified) (1 diff)
• feed.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• include/picture_comment.inc.php (modified) (2 diffs)
• picture.php (modified) (1 diff)

branches/2.0/admin/comments.php

@@ -140 +140 @@
       ON i.id = c.image_id
   WHERE validated = \'false\'
-  ORDER BY c.date DESC  
+  ORDER BY c.date DESC
 ;';
 $result = pwg_query($query);
@@ -161 +161 @@
       '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'])
       )

branches/2.0/admin/intro.php

@@ -222 +222 @@
       sprintf(
         l10n('first element added on %s'),
-        format_date($first_date, 'mysql_datetime')
+        format_date($first_date)
         )
       )

branches/2.0/admin/picture_modify.php

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

branches/2.0/comments.php

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

branches/2.0/feed.php

@@ -123 +123 @@
   {
     $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'];
 

branches/2.0/include/functions.inc.php

@@ -570 +570 @@
 
 // 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;

branches/2.0/include/picture_comment.inc.php

@@ -131 +131 @@
     while ($row = mysql_fetch_array($result))
     {
-      $tpl_comment = 
+      $tpl_comment =
         array(
           'AUTHOR' => trigger_event('render_comment_author',
@@ -138 +138 @@
             : $row['author']),
 
-          'DATE' => format_date(
-            $row['date'],
-            'mysql_datetime',
-            true),
+          'DATE' => format_date( $row['date'], true),
 
           'CONTENT' => trigger_event('render_comment_content',$row['content']),

branches/2.0/picture.php

@@ -814 +814 @@
 
 // date of availability
-$val = format_date($picture['current']['date_available'], 'mysql_datetime');
+$val = format_date($picture['current']['date_available']);
 $url = make_index_url(
   array(