Merge pull request mcamara#292 from okaufmann/master

Marc Cámara · Marc Cámara · commit 3c14c66df8de · 2016-02-19T16:00:27.000Z
fix if condition to not overwrite $locale
diff --git a/src/Mcamara/LaravelLocalization/Middleware/LocaleCookieRedirect.php b/src/Mcamara/LaravelLocalization/Middleware/LocaleCookieRedirect.php
@@ -17,7 +17,7 @@ public function handle( $request, Closure $next )
         $params = explode('/', $request->path());
         $locale = $request->cookie('locale', false);
 
-        if ( count($params) > 0 && $locale = app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )
+        if ( count($params) > 0 && app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )
         {
             cookie('locale', $params[ 0 ]);
 
diff --git a/src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php b/src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php
@@ -17,7 +17,7 @@ public function handle( $request, Closure $next )
         $params = explode('/', $request->path());
         $locale = session('locale', false);
 
-        if ( count($params) > 0 && $locale = app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )
+        if ( count($params) > 0 && app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )
         {
             session([ 'locale' => $params[ 0 ] ]);
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function handle( $request, Closure $next )`
`17`	`17`	`$params = explode('/', $request->path());`
`18`	`18`	`$locale = $request->cookie('locale', false);`
`19`	`19`
`20`		`- if ( count($params) > 0 && $locale = app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )`
	`20`	`+ if ( count($params) > 0 && app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )`
`21`	`21`	`{`
`22`	`22`	`cookie('locale', $params[ 0 ]);`
`23`	`23`