Cleaning and fixing stuff

ARCANEDEV · Sep 21, 2015 · f7806f3 · f7806f3
1 parent 46a40fc
commit f7806f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/Middleware/LocaleCookieRedirect.php b/src/Middleware/LocaleCookieRedirect.php
@@ -2,7 +2,6 @@
 
 use Arcanedev\Localization\Bases\Middleware;
 use Closure;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
 /**
@@ -39,10 +38,7 @@ public function handle(Request $request, Closure $next)
 
         $locale = $request->cookie('locale', null);
 
-        if (
-            ! is_null($locale) &&
-            ! $this->isDefaultLocaleHidden($locale)
-        ) {
+        if (is_string($locale) && ! $this->isDefaultLocaleHidden($locale)) {
             session()->reflash();
 
             $redirect = $this->getLocalizedRedirect($locale);

diff --git a/src/Middleware/LocaleSessionRedirect.php b/src/Middleware/LocaleSessionRedirect.php
@@ -38,10 +38,7 @@ public function handle(Request $request, Closure $next)
 
         $locale = session('locale', null);
 
-        if (
-            ! is_null($locale) &&
-            ! $this->isDefaultLocaleHidden($locale)
-        ) {
+        if (is_string($locale) && ! $this->isDefaultLocaleHidden($locale)) {
             session()->reflash();
 
             $redirect = $this->getLocalizedRedirect($locale);