diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php index d62736086..c5b2e1b8a 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); }