Changeset 3123


Ignore:
Timestamp:
Feb 4, 2009, 3:42:17 AM (15 years ago)
Author:
rvelices
Message:

merge r3122 from trunk

  • removed second parameter $type from function format_date
Location:
branches/2.0
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/admin/comments.php

    r3046 r3123  
    140140      ON i.id = c.image_id
    141141  WHERE validated = \'false\'
    142   ORDER BY c.date DESC 
     142  ORDER BY c.date DESC
    143143;';
    144144$result = pwg_query($query);
     
    161161      'TN_SRC' => $thumb,
    162162      'AUTHOR' => trigger_event('render_comment_author', $row['author']),
    163       'DATE' => format_date($row['date'],'mysql_datetime',true),
     163      'DATE' => format_date($row['date'], true),
    164164      'CONTENT' => trigger_event('render_comment_content',$row['content'])
    165165      )
  • branches/2.0/admin/intro.php

    r3046 r3123  
    222222      sprintf(
    223223        l10n('first element added on %s'),
    224         format_date($first_date, 'mysql_datetime')
     224        format_date($first_date)
    225225        )
    226226      )
  • branches/2.0/admin/picture_modify.php

    r3046 r3123  
    242242    'FILESIZE' => @$row['filesize'].' KB',
    243243
    244     'REGISTRATION_DATE' =>
    245       format_date($row['date_available'], 'mysql_datetime', false),
     244    'REGISTRATION_DATE' => format_date($row['date_available']),
    246245
    247246    'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],
  • branches/2.0/comments.php

    r3046 r3123  
    365365        'ALT' => $name,
    366366        'AUTHOR' => trigger_event('render_comment_author', $author),
    367         'DATE'=>format_date($comment['date'],'mysql_datetime',true),
     367        'DATE'=>format_date($comment['date'], true),
    368368        'CONTENT'=>trigger_event('render_comment_content',$comment['content']),
    369369        );
  • branches/2.0/feed.php

    r3046 r3123  
    123123  {
    124124    $item = new FeedItem();
    125     $item->title = sprintf(l10n('New on %s'),
    126         format_date($dbnow, 'mysql_datetime') );
     125    $item->title = sprintf(l10n('New on %s'), format_date($dbnow) );
    127126    $item->link = $conf['gallery_url'];
    128127
  • branches/2.0/include/functions.inc.php

    r3118 r3123  
    570570
    571571// format_date returns a formatted date for display. The date given in
    572 // argument can be a unixdate (number of seconds since the 01.01.1970) or an
    573 // american format (2003-09-15). By option, you can show the time. The
    574 // output is internationalized.
     572// argument must be an american format (2003-09-15). By option, you can show the time.
     573// The output is internationalized.
    575574//
    576 // format_date( "2003-09-15", 'us', true ) -> "Monday 15 September 2003 21:52"
    577 function format_date($date, $type = 'us', $show_time = false)
     575// format_date( "2003-09-15", true ) -> "Monday 15 September 2003 21:52"
     576function format_date($date, $show_time = false)
    578577{
    579578  global $lang;
  • branches/2.0/include/picture_comment.inc.php

    r3046 r3123  
    131131    while ($row = mysql_fetch_array($result))
    132132    {
    133       $tpl_comment = 
     133      $tpl_comment =
    134134        array(
    135135          'AUTHOR' => trigger_event('render_comment_author',
     
    138138            : $row['author']),
    139139
    140           'DATE' => format_date(
    141             $row['date'],
    142             'mysql_datetime',
    143             true),
     140          'DATE' => format_date( $row['date'], true),
    144141
    145142          'CONTENT' => trigger_event('render_comment_content',$row['content']),
  • branches/2.0/picture.php

    r3046 r3123  
    814814
    815815// date of availability
    816 $val = format_date($picture['current']['date_available'], 'mysql_datetime');
     816$val = format_date($picture['current']['date_available']);
    817817$url = make_index_url(
    818818  array(
Note: See TracChangeset for help on using the changeset viewer.