projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
ace7aa8
)
removed usage of array_replace
author
Fabien Potencier
<fabien.potencier@gmail.com>
Mon, 13 Dec 2010 12:50:59 +0000 (13:50 +0100)
committer
Fabien Potencier
<fabien.potencier@gmail.com>
Mon, 13 Dec 2010 12:50:59 +0000 (13:50 +0100)
lib/Twig/Environment.php
patch
|
blob
|
history
diff --git
a/lib/Twig/Environment.php
b/lib/Twig/Environment.php
index
e7a80ed
..
7c98404
100644
(file)
--- 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',