From: Josh Turmel <jturmel@gmail.com>
Date: Wed, 22 Jun 2011 03:14:00 +0000 (-0700)
Subject: Allow setting of timezone on twig_date_format_filter method
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=65937619507a2fe2868415695a8a7cfcec1732bf;p=konrad%2Ftwig.git

Allow setting of timezone on twig_date_format_filter method
---

diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php
index d627360..c5b2e1b 100644
--- a/lib/Twig/Extension/Core.php
+++ b/lib/Twig/Extension/Core.php
@@ -201,7 +201,7 @@ class Twig_Extension_Core extends Twig_Extension
     }
 }
 
-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);
 }