[TwigBridge] fixed fixed scope & trans_default_domain node visitor

symfony · Mar 12, 2013 · fe4cc24 · fe4cc24
1 parent c5e999a
commit fe4cc24
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
@@ -34,6 +34,7 @@ public function __construct(Scope $parent = null)
     {
         $this->parent = $parent;
         $this->left = false;
+        $this->data = array();
     }
 
     /**

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -43,10 +43,6 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
             $this->scope = $this->scope->enter();
         }
 
-        if ($node instanceof \Twig_Node_Module) {
-            $this->scope->set('domain', null);
-        }
-
         if ($node instanceof TransDefaultDomainNode) {
             if ($node->getNode('expr') instanceof \Twig_Node_Expression_Constant) {
                 $this->scope->set('domain', $node->getNode('expr'));