From 991021bf4e78cfd5ef0514273a219fc55deb0098 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 13 Dec 2010 13:50:59 +0100
Subject: [PATCH] removed usage of array_replace

---
 lib/Twig/Environment.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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',
-- 
1.7.2.5