Merge pull request #42 from mediashowroom/master

Don't access "request"-scope when it is not active.
sonata-project · May 23, 2013 · d247775 · d247775
2 parents eebd1c7 + 5696494
commit d247775
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Locale/RequestDetector.php b/Locale/RequestDetector.php
@@ -42,10 +42,11 @@ public function __construct(ContainerInterface $container, $defaultLocale)
      */
     public function getLocale()
     {
-        if ($request = $this->container->get('request', ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
-            return $request->getLocale();
+        if ($this->container->isScopeActive("request")) {
+            if ($request = $this->container->get('request', ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
+                return $request->getLocale();
+            }
         }
-
         return $this->defaultLocale;
     }
 }