merged branch vlechemin/ticket_3472 (PR symfony#3473)

fabpot · fabpot · commit e8c0e078417b · 2012-06-27T20:31:58.000+02:00
Commits ------- ab47a88 [FrameworkBundle][Translator] Fix test for request being available in order to get the locale. Discussion ---------- [FrameworkBundle][Translator] Fix test for request being available. Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: symfony#3472 Todo: -
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -65,7 +65,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
      */
     public function getLocale()
     {
-        if (null === $this->locale && $this->container->has('request')) {
+        if (null === $this->locale && $this->container->isScopeActive('request')) {
             $this->locale = $this->container->get('request')->getLocale();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele`
`65`	`65`	`*/`
`66`	`66`	`public function getLocale()`
`67`	`67`	`{`
`68`		`- if (null === $this->locale && $this->container->has('request')) {`
	`68`	`+ if (null === $this->locale && $this->container->isScopeActive('request')) {`
`69`	`69`	`$this->locale = $this->container->get('request')->getLocale();`
`70`	`70`	`}`
`71`	`71`