twigphp
diff --git a/‎lib/Twig/Environment.php‎
Lines changed: 10 additions & 0 deletions b/‎lib/Twig/Environment.php‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎lib/Twig/Node/From.php‎
Lines changed: 0 additions & 24 deletions b/‎lib/Twig/Node/From.php‎
Lines changed: 0 additions & 24 deletions
diff --git a/‎lib/Twig/Parser.php‎
Lines changed: 8 additions & 0 deletions b/‎lib/Twig/Parser.php‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎lib/Twig/TokenParser/Filter.php‎
Lines changed: 1 addition & 1 deletion b/‎lib/Twig/TokenParser/Filter.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/Twig/TokenParser/From.php‎
Lines changed: 1 addition & 1 deletion b/‎lib/Twig/TokenParser/From.php‎
Lines changed: 1 addition & 1 deletion
@@ -259,6 +259,16 @@ public function getTemplateClass($name)
         return $this->templateClassPrefix.md5($this->loader->getCacheKey($name));
     }
 
+    /**
+     * Gets the template class prefix.
+     *
+     * @return string The template class prefix
+     */
+    public function getTemplateClassPrefix()
+    {
+        return $this->templateClassPrefix;
+    }
+
     /**
      * Loads a template by name.
      *
 
@@ -29,6 +29,7 @@ class Twig_Parser implements Twig_ParserInterface
     protected $env;
     protected $reservedMacroNames;
     protected $importedFunctions;
+    protected $tmpVarCount;
 
     /**
      * Constructor.
@@ -40,6 +41,11 @@ public function __construct(Twig_Environment $env)
         $this->env = $env;
     }
 
+    public function getVarName()
+    {
+        return sprintf('__internal_%s_%d', substr($this->env->getTemplateClass($this->stream->getFilename()), strlen($this->env->getTemplateClassPrefix())), ++$this->tmpVarCount);
+    }
+
     /**
      * Converts a token stream to a node tree.
      *
@@ -49,6 +55,8 @@ public function __construct(Twig_Environment $env)
      */
     public function parse(Twig_TokenStream $stream)
     {
+        $this->tmpVarCount = 0;
+
         // tag handlers
         $this->handlers = $this->env->getTokenParsers();
         $this->handlers->setParser($this);
 
@@ -19,7 +19,7 @@ class Twig_TokenParser_Filter extends Twig_TokenParser
      */
     public function parse(Twig_Token $token)
     {
-        $name = str_replace('.', '_', uniqid('_tmp_', true));
+        $name = $this->parser->getVarName();
         $ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), $token->getLine(), $this->getTag());
 
         $filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());
 
@@ -45,7 +45,7 @@ public function parse(Twig_Token $token)
 
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        $node = new Twig_Node_From($macro, $token->getLine(), $this->getTag());
+        $node = new Twig_Node_Import($macro, new Twig_Node_Expression_AssignName($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag());
 
         foreach($targets as $name => $alias) {
             $this->parser->addImportedFunction($alias, $name, $node->getNode('var'));
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Twig_TokenParser_Filter extends Twig_TokenParser`
`19`	`19`	`*/`
`20`	`20`	`public function parse(Twig_Token $token)`
`21`	`21`	`{`
`22`		`- $name = str_replace('.', '_', uniqid('_tmp_', true));`
	`22`	`+ $name = $this->parser->getVarName();`
`23`	`23`	`$ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), $token->getLine(), $this->getTag());`
`24`	`24`
`25`	`25`	`$filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());`