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

tweaked previous merge (no need to duplicate visitors, handlers and the expression parser when parsing a template inside another one)

Browse Source
This commit is contained in:
Fabien Potencier
2012-01-24 19:12:39 +01:00
parent f958d91e79
commit db9179c77d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Parser.php
+8 -4
View File
@@ -64,17 +64,21 @@ class Twig_Parser implements Twig_ParserInterface
{
// push all variables into the stack to keep the current state of the parser
$vars = get_object_vars($this);
unset($vars['stack'], $vars['env']);
unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser']);
$this->stack[] = $vars;
$this->tmpVarCount = 0;
// tag handlers
$this->handlers = $this->env->getTokenParsers();
$this->handlers->setParser($this);
if (null === $this->handlers) {
$this->handlers = $this->env->getTokenParsers();
$this->handlers->setParser($this);
}
// node visitors
$this->visitors = $this->env->getNodeVisitors();
if (null === $this->visitors) {
$this->visitors = $this->env->getNodeVisitors();
}
if (null === $this->expressionParser) {
$this->expressionParser = new Twig_ExpressionParser($this, $this->env->getUnaryOperators(), $this->env->getBinaryOperators());