merged branch jturmel/patch-1 (PR #367)

Commits ------- 6593761 Allow setting of timezone on twig_date_format_filter method Discussion ---------- Allow setting of timezone on twig_date_format_filter method
twigphp · Jun 24, 2011 · bbf55fe · bbf55fe
2 parents d03edac + 6593761
commit bbf55fe
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php
@@ -201,7 +201,7 @@ public function getName()
     }
 }
 
-function twig_date_format_filter($date, $format = 'F j, Y H:i')
+function twig_date_format_filter($date, $format = 'F j, Y H:i', $timezone = NULL)
 {
     if (!$date instanceof DateTime) {
         if (ctype_digit((string) $date)) {
@@ -212,6 +212,14 @@ function twig_date_format_filter($date, $format = 'F j, Y H:i')
         }
     }
 
+    if ($timezone !== NULL) {
+        if (!$timezone instanceof DateTimeZone) {
+            $timezone = new DateTimeZone($timezone);
+        }
+
+        $date->setTimezone($timezone);
+    }
+
     return $date->format($format);
 }