summaryrefslogtreecommitdiff
path: root/inc/lib/Twig/Node/Embed.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/lib/Twig/Node/Embed.php')
-rw-r--r--inc/lib/Twig/Node/Embed.php20
1 files changed, 14 insertions, 6 deletions
diff --git a/inc/lib/Twig/Node/Embed.php b/inc/lib/Twig/Node/Embed.php
index 4c9456dc..3785d3a9 100644
--- a/inc/lib/Twig/Node/Embed.php
+++ b/inc/lib/Twig/Node/Embed.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -17,22 +17,30 @@
class Twig_Node_Embed extends Twig_Node_Include
{
// we don't inject the module to avoid node visitors to traverse it twice (as it will be already visited in the main module)
- public function __construct($filename, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
+ public function __construct($name, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
{
parent::__construct(new Twig_Node_Expression_Constant('not_used', $lineno), $variables, $only, $ignoreMissing, $lineno, $tag);
- $this->setAttribute('filename', $filename);
+ $this->setAttribute('name', $name);
+ // to be removed in 2.0, used name instead
+ $this->setAttribute('filename', $name);
$this->setAttribute('index', $index);
}
protected function addGetTemplate(Twig_Compiler $compiler)
{
$compiler
- ->write("\$this->env->loadTemplate(")
- ->string($this->getAttribute('filename'))
+ ->write('$this->loadTemplate(')
+ ->string($this->getAttribute('name'))
+ ->raw(', ')
+ ->repr($this->getTemplateName())
+ ->raw(', ')
+ ->repr($this->getTemplateLine())
->raw(', ')
->string($this->getAttribute('index'))
- ->raw(")")
+ ->raw(')')
;
}
}
+
+class_alias('Twig_Node_Embed', 'Twig\Node\EmbedNode', false);