projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
78b104b
)
tweaked merge filter
author
Fabien Potencier
<fabien.potencier@gmail.com>
Thu, 16 Dec 2010 08:44:10 +0000 (09:44 +0100)
committer
Fabien Potencier
<fabien.potencier@gmail.com>
Thu, 16 Dec 2010 08:44:10 +0000 (09:44 +0100)
doc/templates.rst
patch
|
blob
|
history
diff --git
a/doc/templates.rst
b/doc/templates.rst
index
bad2cb9
..
02bbdcc
100644
(file)
--- a/
doc/templates.rst
+++ b/
doc/templates.rst
@@
-1325,6
+1325,8
@@
The ``merge`` filter merges an array or a hash with the value:
{% set items = items|merge({ 'peugeot': 'car' }) %}
+ {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
+
List of built-in Tests (new in Twig 0.9.9)
------------------------------------------