From 529721d7731bbb9c9ddda642122d3d3447473969 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 4 Feb 2011 12:53:23 +0100 Subject: [PATCH] fixed wrong usage of loadTemplate() --- lib/Twig/Node/Import.php | 2 +- test/Twig/Tests/Node/ImportTest.php | 2 +- test/Twig/Tests/Node/ModuleTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Twig/Node/Import.php b/lib/Twig/Node/Import.php index 746284d..348dd97 100644 --- a/lib/Twig/Node/Import.php +++ b/lib/Twig/Node/Import.php @@ -42,7 +42,7 @@ class Twig_Node_Import extends Twig_Node $compiler ->raw('$this->env->loadTemplate(') ->subcompile($this->getNode('expr')) - ->raw(", true)") + ->raw(")") ; } diff --git a/test/Twig/Tests/Node/ImportTest.php b/test/Twig/Tests/Node/ImportTest.php index 84dc16d..3b5bf08 100644 --- a/test/Twig/Tests/Node/ImportTest.php +++ b/test/Twig/Tests/Node/ImportTest.php @@ -43,7 +43,7 @@ class Twig_Tests_Node_ImportTest extends Twig_Tests_Node_TestCase $var = new Twig_Node_Expression_AssignName('macro', 0); $node = new Twig_Node_Import($macro, $var, 0); - $tests[] = array($node, '$context[\'macro\'] = $this->env->loadTemplate("foo.twig", true);'); + $tests[] = array($node, '$context[\'macro\'] = $this->env->loadTemplate("foo.twig");'); return $tests; } diff --git a/test/Twig/Tests/Node/ModuleTest.php b/test/Twig/Tests/Node/ModuleTest.php index 194bed0..3169130 100644 --- a/test/Twig/Tests/Node/ModuleTest.php +++ b/test/Twig/Tests/Node/ModuleTest.php @@ -109,7 +109,7 @@ class __TwigTemplate_be925a7b06dda0dfdbd18a1509f7eb34 extends Twig_Template { \$context = array_merge(\$this->env->getGlobals(), \$context); - \$context['macro'] = \$this->env->loadTemplate("foo.twig", true); + \$context['macro'] = \$this->env->loadTemplate("foo.twig"); \$this->getParent(\$context)->display(\$context, array_merge(\$this->blocks, \$blocks)); } -- 1.7.2.5