Merge pull request #53 from ARCANEDEV/patch-cookies

Updating the LocaleCookieRedirect Middleware
ARCANEDEV · Aug 5, 2016 · a9cf9af · a9cf9af
2 parents 2b31c16 + f7e7131
commit a9cf9af
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/src/Middleware/LocaleCookieRedirect.php b/src/Middleware/LocaleCookieRedirect.php
@@ -32,21 +32,13 @@ public function handle(Request $request, Closure $next)
         $locale  = $request->cookie('locale', null);
 
         if (localization()->isLocaleSupported($segment)) {
-            cookie('locale', $segment);
-
-            return $next($request);
-        }
-        elseif (localization()->isDefaultLocaleHiddenInUrl()) {
-            $locale = localization()->getDefaultLocale();
-            cookie('locale', $locale);
+            return $next($request)->withCookie(cookie()->forever('locale', $segment));
         }
 
-        if (is_string($locale) && ! $this->isDefaultLocaleHidden($locale)) {
-            session()->reflash();
-
-            $redirect = $this->getLocalizedRedirect($locale);
-
-            if ( ! is_null($redirect)) return $redirect;
+        if ($locale !== null && ! $this->isDefaultLocaleHidden($locale)) {
+            if ( ! is_null($redirect = $this->getLocalizedRedirect($locale))) {
+                return $redirect->withCookie(cookie()->forever('locale', $segment));
+            }
         }
 
         return $next($request);