From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 27 Aug 2011 07:38:43 +0000 (+0200)
Subject: replaced usage of array_replace by array_merge (for 5.2 compatibility)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=46c258d29db8473e2ecb4b07c456dc0ecebf4513;p=web%2Fkonrad%2Ftwig.git

replaced usage of array_replace by array_merge (for 5.2 compatibility)
---

diff --git a/lib/Twig/Node/Module.php b/lib/Twig/Node/Module.php
index b23c215..0ac13dd 100644
--- 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()
             ;