Merge branch 'master' into Cruddy-By-Design

This commit is contained in:
HDVinnie
2019-10-28 14:39:16 -04:00
21 changed files with 99 additions and 62 deletions
+2 -2
View File
@@ -50,7 +50,7 @@ class LanguageController extends Controller
{
$this->setLocale($locale, $request);
$url = config('language.url') ? url('/' . $locale) : url('/');
$url = config('language.url') ? url('/'.$locale) : url('/');
return redirect($url)
->withSuccess('Language Changed!');
@@ -76,7 +76,7 @@ class LanguageController extends Controller
} else {
$previous_url = substr($previous_url, strrpos($previous_url, '/') + 1);
}
$url = rtrim(env('APP_URL'), '/') . '/' . $locale . '/' . ltrim($previous_url, '/');
$url = rtrim(env('APP_URL'), '/').'/'.$locale.'/'.ltrim($previous_url, '/');
$session->setPreviousUrl($url);
}