Merge branch 'master' of github.com:mcamara/laravel-localization

mcamara · Nov 15, 2015 · bf2d8f4 · bf2d8f4
2 parents 3b0da23 + 250abff
commit bf2d8f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Mcamara/LaravelLocalization/LanguageNegotiator.php b/src/Mcamara/LaravelLocalization/LanguageNegotiator.php
@@ -65,7 +65,7 @@ public function negotiateLanguage()
         {
             reset($this->supportedLanguages);
 
-            return key($array);
+            return key($this->supportedLanguages);
         }
 
         if ( class_exists('Locale') && !empty( $_SERVER[ 'HTTP_ACCEPT_LANGUAGE' ] ) )
@@ -154,4 +154,4 @@ private function getMatchesFromAcceptedLanguages()
 
         return $matches;
     }
-}
+}
diff --git a/src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php b/src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php
@@ -26,7 +26,7 @@ public function handle( $request, Closure $next )
 
         $locale = session('locale', false);
 
-        if ( $locale && !( app('laravellocalization')->getDefaultLocale() === $locale && app('laravellocalization')->hideDefaultLocaleInURL() ) )
+        if ( $locale && app('laravellocalization')->checkLocaleInSupportedLocales($locale) && !( app('laravellocalization')->getDefaultLocale() === $locale && app('laravellocalization')->hideDefaultLocaleInURL() ) )
         {
             app('session')->reflash();
             $redirection = app('laravellocalization')->getLocalizedURL($locale);
@@ -36,4 +36,4 @@ public function handle( $request, Closure $next )
 
         return $next($request);
     }
-}
+}