merged branch uwej711/fix_locale_is_overridden_2_1 (PR #7686)

fabpot · fabpot · commit 580b2493104d · 2013-04-17T07:38:53.000+02:00
This PR was merged into the 2.1 branch. Discussion ---------- [HttpKernel] fix overwriting of request's locale if attribute _locale is missing In addition to #7516 same change for the 2.1 branch, see comments on lunetics-org/LocaleBundle#59 Commits ------- da156d3 fix overwriting of request's locale if attribute _locale is missing
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -50,7 +50,7 @@ public function onKernelRequest(GetResponseEvent $event)
         $request = $event->getRequest();
 
         $request->setDefaultLocale($this->defaultLocale);
-        $this->setLocale($request, $request->attributes->get('_locale', $this->defaultLocale));
+        $this->setLocale($request, $request->attributes->get('_locale', $request->getLocale()));
 
         array_unshift($this->locales, $request->getLocale());
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -68,6 +68,17 @@ public function testLocaleSetForRoutingContext()
         $listener->onKernelRequest($this->getEvent($request));
     }
 
+    public function testRequestLocaleIsNotOverridden()
+    {
+        $request = Request::create('/');
+        $request->setLocale('de');
+        $listener = new LocaleListener('fr');
+        $event = $this->getEvent($request);
+
+        $listener->onKernelRequest($event);
+        $this->assertEquals('de', $request->getLocale());
+    }
+
     private function getEvent(Request $request)
     {
         return new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, HttpKernelInterface::MASTER_REQUEST);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function onKernelRequest(GetResponseEvent $event)`
`50`	`50`	`$request = $event->getRequest();`
`51`	`51`
`52`	`52`	`$request->setDefaultLocale($this->defaultLocale);`
`53`		`- $this->setLocale($request, $request->attributes->get('_locale', $this->defaultLocale));`
	`53`	`+ $this->setLocale($request, $request->attributes->get('_locale', $request->getLocale()));`
`54`	`54`
`55`	`55`	`array_unshift($this->locales, $request->getLocale());`
`56`	`56`	`}`