From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 13 Dec 2010 12:50:59 +0000 (+0100)
Subject: removed usage of array_replace
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=991021bf4e78cfd5ef0514273a219fc55deb0098;p=web%2Fkonrad%2Ftwig.git

removed usage of array_replace
---

diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index e7a80ed..7c98404 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -83,7 +83,7 @@ class Twig_Environment
             $this->setCompiler($compiler);
         }
 
-        $options = array_replace(array(
+        $options = array_merge(array(
             'debug'               => false,
             'charset'             => 'UTF-8',
             'base_template_class' => 'Twig_Template',