Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
vluzrmos committed Jan 8, 2016
2 parents c1f2bd1 + efe9db0 commit 58359fa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Providers/LanguageDetectorServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected function registerEncryptCookies()
{
$this->app->resolving('Illuminate\Cookie\Middleware\EncryptCookies', function ($middleware) {
if ($this->config('cookie', true) && ! $this->config('cookie_encrypt', false)) {
$middleware->disableFor($this->config('lang-detector.cookie_name', 'locale'));
$middleware->disableFor($this->config('cookie_name', 'locale'));
}
});
}
Expand Down

0 comments on commit 58359fa

Please sign in to comment.