replaced usage of array_replace by array_merge (for 5.2 compatibility)
authorFabien Potencier <fabien.potencier@gmail.com>
Sat, 27 Aug 2011 07:38:43 +0000 (09:38 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Sat, 27 Aug 2011 07:46:10 +0000 (09:46 +0200)
lib/Twig/Node/Module.php

index b23c215..0ac13dd 100644 (file)
@@ -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()
             ;