geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Commits
-------

6593761 Allow setting of timezone on twig_date_format_filter method

Discussion
----------

Allow setting of timezone on twig_date_format_filter method
This commit is contained in:
Fabien Potencier
2011-06-24 10:39:24 +02:00
parent d03edac8ae 6593761950
commit bbf55fe391
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Extension/Core.php
+9 -1
View File
@@ -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);
}