diff --git a/NEWS b/NEWS index f7eb3d41..6388b972 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +- emulate %R in the date_format modifier on windows (Danilo Buerger, boots) + +Version 2.6.16 (Dec 1st, 2006) +------------------------------- + - fixed replacement bug in trimwhitespace output filter that was introduced in the last release (Spuerhund, boots) diff --git a/libs/plugins/modifier.date_format.php b/libs/plugins/modifier.date_format.php index 8266e9d7..1234af2f 100644 --- a/libs/plugins/modifier.date_format.php +++ b/libs/plugins/modifier.date_format.php @@ -33,8 +33,8 @@ function smarty_modifier_date_format($string, $format="%b %e, %Y", $default_date if (substr(PHP_OS,0,3) == 'WIN') { $hours = strftime('%I', $string); $short_hours = ( $hours < 10 ) ? substr( $hours, -1) : $hours; - $_win_from = array ('%e', '%T', '%D', '%l'); - $_win_to = array ('%#d', '%H:%M:%S', '%m/%d/%y', $short_hours); + $_win_from = array ('%e', '%T', '%D', '%l', '%R'); + $_win_to = array ('%#d', '%H:%M:%S', '%m/%d/%y', $short_hours, '%H:%M'); $format = str_replace($_win_from, $_win_to, $format); } if($string != '') {