Merge pull request #981 from billmn/settings-locale-fix

Fixed wrong Locale on Settings form submit
2015-10-02 20:00:54 +01:00
parent 52119f97cf 254c81af1b
commit dbcf567505
1 changed files with 3 additions and 1 deletions
--- a/app/Http/Controllers/Dashboard/SettingsController.php
+++ b/app/Http/Controllers/Dashboard/SettingsController.php
@@ -168,7 +168,9 @@ class SettingsController extends Controller
            return Redirect::route('dashboard.settings.setup')->withErrors(trans('dashboard.settings.edit.failure'));
        }

-        Lang::setLocale(Binput::get('app_locale'));
+        if (Binput::has('app_locale')) {
+            Lang::setLocale(Binput::get('app_locale'));
+        }

        return Redirect::route('dashboard.settings.setup')
            ->withSuccess(trans('dashboard.settings.edit.success'));