projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
c609060
)
replaced usage of array_replace by array_merge (for 5.2 compatibility)
author
Fabien Potencier
<fabien.potencier@gmail.com>
Sat, 27 Aug 2011 07:38:43 +0000 (09:38 +0200)
committer
Fabien Potencier
<fabien.potencier@gmail.com>
Sat, 27 Aug 2011 07:46:10 +0000 (09:46 +0200)
lib/Twig/Node/Module.php
patch
|
blob
|
history
diff --git
a/lib/Twig/Node/Module.php
b/lib/Twig/Node/Module.php
index
b23c215
..
0ac13dd
100644
(file)
--- a/
lib/Twig/Node/Module.php
+++ b/
lib/Twig/Node/Module.php
@@
-144,7
+144,7
@@
class Twig_Node_Module extends Twig_Node
}
$compiler
- ->write("\$this->blocks = array_replace(\n")
+ ->write("\$this->blocks = array_merge(\n")
->indent()
;