From f4543a81c4d47900bed043ea06c16e3ccc78c2cc Mon Sep 17 00:00:00 2001
From: Kevin Papst <kpapst@gmx.net>
Date: Mon, 1 Jan 2018 17:49:07 +0100
Subject: [PATCH] fix default locale redirect

---
 .../EventListener/RedirectToPreferredLocaleListener.php  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php b/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php
index 5fe88e53..d9f648fd 100644
--- a/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php
+++ b/src/AppBundle/EventListener/RedirectToPreferredLocaleListener.php
@@ -57,7 +57,6 @@ class RedirectToPreferredLocaleListener
         if (empty($this->locales)) {
             throw new \UnexpectedValueException('The list of supported locales must not be empty.');
         }
-
         $this->defaultLocale = $defaultLocale ?: $this->locales[0];
 
         if (!in_array($this->defaultLocale, $this->locales)) {
@@ -79,7 +78,7 @@ class RedirectToPreferredLocaleListener
         $request = $event->getRequest();
 
         // Ignore sub-requests and all URLs but the homepage
-        if (!$event->isMasterRequest() || '/' !== $request->getPathInfo()) {
+        if ('/' !== $request->getPathInfo()) {
             return;
         }
         // Ignore requests from referrers with the same HTTP host in order to prevent
@@ -90,9 +89,7 @@ class RedirectToPreferredLocaleListener
 
         $preferredLanguage = $request->getPreferredLanguage($this->locales);
 
-        if ($preferredLanguage !== $this->defaultLocale) {
-            $response = new RedirectResponse($this->urlGenerator->generate('homepage', ['_locale' => $preferredLanguage]));
-            $event->setResponse($response);
-        }
+        $response = new RedirectResponse($this->urlGenerator->generate('homepage', ['_locale' => $preferredLanguage]));
+        $event->setResponse($response);
     }
 }