Ignore:
Timestamp:
Jul 6, 2010, 10:11:06 PM (14 years ago)
Author:
rvelices
Message:

merge r6668 from trunk

  • removed function get_extra_fields and its usage (unnecessary + perf issue when retrieving many image ids in a section)
  • 2 fixes recent feed.php commit
    • month names were decalated by one
    • strptime function is not implemented under Windows in php
  • added somme missing $ROOT_URL in templates
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/include/functions_notification.inc.php

    r6663 r6669  
    8080      if (!empty($end))
    8181      {
    82         $query .= '     
     82        $query .= '
    8383    AND c.validation_date <= \''.$end.'\'';
    8484      }
     
    9595      }
    9696      if (!empty($end))
    97       {     
     97      {
    9898        $query .= ' AND date <= \''.$end.'\'';
    9999      }
     
    620620
    621621  $title = l10n_dec('%d new image', '%d new images', $date_detail['nb_elements']);
    622   $title .= ' ('.$lang['month'][(int)$exploded_date['tm_mon']].' '.$exploded_date['tm_mday'].')';
     622  $title .= ' ('.$lang['month'][1+$exploded_date['tm_mon']].' '.$exploded_date['tm_mday'].')';
    623623
    624624  return $title;
    625625}
    626626
     627if(!function_exists("strptime"))
     628{
     629                function strptime($date, $fmt)
     630                {
     631                        if ($fmt != '%Y-%m-%d %H:%M:%S')
     632                                die('Invalid strptime format '.$fmt);
     633                        list($y,$m,$d,$H,$M,$S) = preg_split('/[-: ]/', $date);
     634                        $res = localtime( mktime($H,$M,$S,$m,$d,$y), true );
     635                        return $res;
     636                }
     637 }
    627638?>
Note: See TracChangeset for help on using the changeset viewer.