[TwigBridge] fixed fixed scope & trans_default_domain node visitor

jfsimon · jfsimon · commit fe4cc249b500 · 2013-03-12T17:20:40.000+01:00
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'));

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public function __construct(Scope $parent = null)`
`34`	`34`	`{`
`35`	`35`	`$this->parent = $parent;`
`36`	`36`	`$this->left = false;`
	`37`	`+ $this->data = array();`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`/**`