geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed Module.php to pass existing tests

Browse Source
This commit is contained in:
Jannis Grimm
2011-07-25 22:12:48 +02:00
parent fab8c72d08
commit 9822ac491e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Node/Module.php
+8 -2
View File
@@ -72,7 +72,13 @@ class Twig_Node_Module extends Twig_Node
->write("\$parent = ")
->subcompile($this->getNode('parent'))
->raw(";\n")
->write("if(!isset(\$this->parent[\$parent])) {\n")
->write("if (\$parent instanceof Twig_Template) {\n")
->indent()
->write("\$name = \$parent->getTemplateName();\n")
->write("\$this->parent[\$name] = \$parent;\n")
->write("\$parent = \$name;\n")
->outdent()
->write("} elseif (!isset(\$this->parent[\$parent])) {\n")
->indent()
->write("\$this->parent[\$parent] = \$this->env->loadTemplate(\$parent);\n")
->outdent()
@@ -126,6 +132,7 @@ class Twig_Node_Module extends Twig_Node
->write("public function __construct(Twig_Environment \$env)\n", "{\n")
->indent()
->write("parent::__construct(\$env);\n\n")
->write("\$this->parent = array();\n")
;
$countTraits = count($this->getNode('traits'));
@@ -160,7 +167,6 @@ class Twig_Node_Module extends Twig_Node
}
$compiler
->write("\$parent = array()")
->write("\$this->blocks = array_replace(\n")
->indent()
;