geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 11:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  fixed ReST format
  Document combining JSON constants
This commit is contained in:
Fabien Potencier
2018-10-12 05:54:33 -07:00
parent 5dd532eed8 d59dfc979b
commit c8020aa5d8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/filters/json_encode.rst
+4 -1
View File
@@ -15,7 +15,10 @@ Arguments
---------
* ``options``: A bitmask of `json_encode options`_ (``{{
data|json_encode(constant('JSON_PRETTY_PRINT')) }}``)
data|json_encode(constant('JSON_PRETTY_PRINT')) }}``.
Combine constants using `Twig's bitwise operators`: ``{{
data|json_encode(constant('JSON_PRETTY_PRINT') b-or constant('JSON_HEX_QUOT') }}``)
.. _`json_encode`: https://secure.php.net/json_encode
.. _`json_encode options`: https://secure.php.net/manual/en/json.constants.php
.. _`Twig's bitwise operators`: https://twig.symfony.com/doc/2.x/templates.html#logic