From 46c258d29db8473e2ecb4b07c456dc0ecebf4513 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 27 Aug 2011 09:38:43 +0200 Subject: [PATCH] replaced usage of array_replace by array_merge (for 5.2 compatibility) --- lib/Twig/Node/Module.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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() ; -- 1.7.2.5