X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Fmodifier.date_format.php;h=7f8d4907585d40730b6994a9e97749afc23a398d;hb=5f6b3a28efe41c038f349fb0b281d9637f7078de;hp=7714f1635bc3990563c07c10b6a12a3526619cc9;hpb=5f30b30e8b2657ade5c727e98de286386ee002d8;p=platal.git

diff --git a/plugins/modifier.date_format.php b/plugins/modifier.date_format.php
index 7714f16..7f8d490 100644
--- a/plugins/modifier.date_format.php
+++ b/plugins/modifier.date_format.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,29 +19,13 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
+// %x stands for 15 mai 2010, %X for 12:14:26
 function smarty_modifier_date_format($string, $format = '%x', $default_date=null)
 {
     $d = empty($string) ? $default_date : $string;
     if (empty($format) || preg_match('/^[ 0\-]*$/', $d)) return;
-    $f = str_replace('%X', '%T', str_replace('%x', '%e %B %Y', $format));
 
-    if (preg_match('/^\d{14}$/', $d)) {
-        $t = mktime(substr($d,8,2), substr($d,10,2), substr($d,12,2), substr($d,4,2), substr($d,6,2), substr($d,0,4));
-    } elseif (preg_match('/^\d{8}$/', $d)) {
-        $t = mktime(0, 0, 0, substr($d,4,2), substr($d,6,2), substr($d,0,4));
-    } elseif (is_numeric($d)) {
-        $t = intval($d);
-    } else {
-        $t = strtotime($d);
-    }
-
-    if ( $t != -1 ) {
-        return strftime($f , $t);
-    } else {
-        require_once('Date.php');
-        $date = new Date($d);
-        return $date->format($f);
-    }
+    return format_datetime($d, $format);
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: