geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 10:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed block() is defined call when using a template argument

Browse Source
This commit is contained in:
Fabien Potencier
2016-11-18 15:44:11 -05:00
parent c04d077e4f
commit a5526f32fb
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Node/Expression/BlockReference.php
+21 -22
View File
@@ -39,47 +39,46 @@ class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
public function compile(Twig_Compiler $compiler)
{
if ($this->getAttribute('is_defined_test')) {
$compiler
->raw('$this->hasBlock(')
->subcompile($this->getNode('name'))
->raw(', $context, $blocks)')
$this
->compileTemplateCall($compiler, 'hasBlock')
->compileBlockArguments($compiler)
;
} else {
if ($this->getAttribute('output')) {
$compiler->addDebugInfo($this);
$this
->compileTemplateCall($compiler)
->raw('->displayBlock')
;
$this
->compileTemplateCall($compiler, 'displayBlock')
->compileBlockArguments($compiler)
->raw(";\n");
} else {
$this
->compileTemplateCall($compiler)
->raw('->renderBlock')
->compileTemplateCall($compiler, 'renderBlock')
->compileBlockArguments($compiler)
;
$this->compileBlockArguments($compiler);
}
}
}
private function compileTemplateCall(Twig_Compiler $compiler)
private function compileTemplateCall(Twig_Compiler $compiler, $method)
{
if (!$this->hasNode('template')) {
return $compiler->write('$this');
$compiler->write('$this');
} else {
$compiler
->write('$this->loadTemplate(')
->subcompile($this->getNode('template'))
->raw(', ')
->repr($this->getTemplateName())
->raw(', ')
->repr($this->getTemplateLine())
->raw(')')
;
}
return $compiler
->write('$this->loadTemplate(')
->subcompile($this->getNode('template'))
->raw(', ')
->repr($this->getTemplateName())
->raw(', ')
->repr($this->getTemplateLine())
->raw(')')
;
$compiler->raw(sprintf('->%s', $method));
return $this;
}
private function compileBlockArguments(Twig_Compiler $compiler)