Smarty update to 2.6.14

[contagged] / smarty / plugins / modifier.date_format.php

diff --git a/smarty/plugins/modifier.date_format.php b/smarty/plugins/modifier.date_format.php
index dbe26a550c80730e92a166a586b30257433d4f3f..523c144f12443914db57487f98c03b66ad2f9d7c 100644 (file)
--- a/smarty/plugins/modifier.date_format.php
+++ b/smarty/plugins/modifier.date_format.php
@@ -11,7 +11,7 @@
 require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
 /**
  * Smarty date_format modifier plugin
- * 
+ *
  * Type:     modifier<br>
  * Name:     date_format<br>
  * Purpose:  format datestamps via strftime<br>
@@ -21,6 +21,7 @@ require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
  *         - default_date: default date if $string is empty
  * @link http://smarty.php.net/manual/en/language.modifier.date.format.php
  *          date_format (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
  * @param string
  * @param string
  * @param string
@@ -29,13 +30,18 @@ require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
  */
 function smarty_modifier_date_format($string, $format="%b %e, %Y", $default_date=null)
 {
-       if($string != '') {
-       return strftime($format, smarty_make_timestamp($string));
-       } elseif (isset($default_date) && $default_date != '') {                
-       return strftime($format, smarty_make_timestamp($default_date));
-       } else {
-               return;
-       }
+    if (substr(PHP_OS,0,3) == 'WIN') {
+           $_win_from = array ('%e',  '%T',       '%D');
+           $_win_to   = array ('%#d', '%H:%M:%S', '%m/%d/%y');
+           $format = str_replace($_win_from, $_win_to, $format);
+    }
+    if($string != '') {
+        return strftime($format, smarty_make_timestamp($string));
+    } elseif (isset($default_date) && $default_date != '') {
+        return strftime($format, smarty_make_timestamp($default_date));
+    } else {
+        return;
+    }
 }
 
 /* vim: set expandtab: */