From: Fabien Potencier Date: Tue, 29 May 2012 18:09:42 +0000 (+0200) Subject: merged branch blaugueux/master (PR #736) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=26db55023028f410da6b09baf9d56ef75d784772;p=web%2Fkonrad%2Ftwig.git merged branch blaugueux/master (PR #736) Commits ------- c53a02d Fixed DateTimeZone support in date filter. Discussion ---------- Fixed DateTimeZone support in date filter. Now $date converted to a DateTime has a DateTimeZone in every case. --------------------------------------------------------------------------- by fabpot at 2012-05-28T19:20:47Z Can you add some unit tests to avoid regression to happen later? Thanks. --------------------------------------------------------------------------- by blaugueux at 2012-05-29T07:52:58Z @fabpot Here they are. --------------------------------------------------------------------------- by fabpot at 2012-05-29T10:29:28Z Great! Can you add a note in the CHANGELOG file and then squash your commit before I merge? Thanks. --------------------------------------------------------------------------- by blaugueux at 2012-05-29T12:52:22Z Changelog added. First squash of my life, i cannot say if it's good :( --------------------------------------------------------------------------- by stof at 2012-05-29T12:55:26Z it is not. you merged your remote branch instead of forcing the push --------------------------------------------------------------------------- by blaugueux at 2012-05-29T17:12:05Z Ok @stof, thanks for your help. I think it's good now. @fabpot Is it ok for you ? --- 26db55023028f410da6b09baf9d56ef75d784772 diff --cc CHANGELOG index 2859774,70262eb..c454bfa --- a/CHANGELOG +++ b/CHANGELOG @@@ -1,8 -1,8 +1,9 @@@ * 1.8.2 (2012-XX-XX) + * added the abs filter * fixed a regression when using a number in template attributes * fixed compiler when mbstring.func_overload is set to 2 + * fixed DateTimeZone support in date filter * 1.8.1 (2012-05-17)