This PR was merged into the master branch.
Discussion
----------
Update json_encode.rst
a more-useful description of the "options" argument >_>
Commits
-------
742043f Update json_encode.rst
This PR was squashed before being merged into the master branch (closes#1042).
Discussion
----------
Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error:
$environment->addFunction(new Twig_SimpleFunction(...))
after
$environment->render(...)
throws Fatal Error:
object of Twig_SimpleFunction could not be converted to string
Commits
-------
92e97b9 Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
This PR was merged into the master branch.
Discussion
----------
Adding a section about the slice filter to doc/tags/for.rst
This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")
Commits
-------
202641a Adding link to slice filter per Stof's suggestion
8ebbaaa Adding a section about the slice filter
This PR was merged into the master branch.
Discussion
----------
Minor typo in sort filter documentation
I've found this small typo while working on shuffle filter documentation in https://github.com/fabpot/Twig/pull/1038
I decided to create separate PR in case https://github.com/fabpot/Twig/pull/1038 got rejected
Best regards!
Commits
-------
1443b76 minor typo in sort documentation
This PR was merged into the master branch.
Discussion
----------
Fix filename for batch filter documentation
The documentation on the website for the batch filter currently 404s See: http://twig.sensiolabs.org/doc/filters/batch.html
I believe this is because the filename is incorrect. This PR fixes that.
Commits
-------
bb05942 Fix filename for batch filter documentation
This PR was merged into the master branch.
Discussion
----------
Revert "merged branch pierrejoye/master (PR #855)"
This reverts commit 347bc81d6e
This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)
Commits
-------
4383388 Revert "merged branch pierrejoye/master (PR #855)"
This PR was merged into the master branch.
Commits
-------
c6ef23a Update striptags.rst
Discussion
----------
Update striptags.rst
Hello
I just changed
{% some_html|striptags %}
to
{{ some_html|striptags }}
Regards
Julien
This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")
This PR was merged into the master branch.
Commits
-------
59d0eed Update merge.rst
Discussion
----------
Update merge.rst
Typo in first line:
The merge filter merges an array with [removed: the] another array
This PR was merged into the master branch.
Commits
-------
c82308a deprecated use, -4 files to include.
Discussion
----------
Depraceted use of Twig_Filter_Function in Core Extension
Simple fix, that reduces included files count by 4 (in default configuration).
This PR was merged into the master branch.
Commits
-------
999b1c4 Force timezone setting in date filter
Discussion
----------
Force timezone setting in date filter
In instances where the $time parameter to the DateTime ctor includes a timezone, the $timezone argument is ignored. This functionality extends to the date filter.
http://uk3.php.net/manual/en/datetime.construct.php
"The $timezone parameter and the current timezone are ignored when the $time parameter either is a UNIX timestamp (e.g. @946684800) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00)."
Accepting this pull request is dependent on whether the desired functionality of the date filter should honour the PHP way of doing things, or the more logical and natural functionality anticipated by a Twig template designer; always ensuring the timezone passed into the date filter is applied.
This PR was merged into the master branch.
Commits
-------
667b274 Added unit test for bug when calling getGlobals() before addGlobal() on Twig_Environment.
Discussion
----------
Bug when calling getGlobals() before addGlobal() on Twig_Environment.
There seems to be an issue when calling getGlobals() before addGlobal(), the globals wont get updated. It doesn't seem to matter if the global existed before the call to getGlobals(). An update of the globals can be forced by calling an additional getGlobals() after the addGlobal() call.
I believe the problem has something to do with runtimeInitialized/extensionInitialized being set to true during rendering, but globals don't get updated during that phase.
Not sure how to fix it so I'm just sending you a unit test showcasing the bug.
This PR was merged into the master branch.
Commits
-------
e2a068d [Doc] Updated template_from_string to use include function
Discussion
----------
[Doc] Updated template_from_string to use include function
instead of include tag
Fabien Potencier
Rick Prent
Ben
Vasiliy Horbachenko
Tom Corrigan
Ricard Clau
Tugdual Saunier
Kevin Boyd
specialguest
Pascal Borreli
carlwitt
Tobias Schultze
Michał Pawłowski
Grégoire Pineau
Luiz “Felds” Liscia
Jesper Ek