removed usage of array_replace
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 13 Dec 2010 12:50:59 +0000 (13:50 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 13 Dec 2010 12:50:59 +0000 (13:50 +0100)
lib/Twig/Environment.php

index e7a80ed..7c98404 100644 (file)
@@ -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',