From 753a7333f122985ed80135b091a6dc7ffb198780 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 25 Mar 2016 05:39:08 -0700 Subject: [PATCH] If the settings table is empty, set a default --- app/Http/Middleware/CheckLocale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Middleware/CheckLocale.php b/app/Http/Middleware/CheckLocale.php index d3cf866fd..98753ca17 100644 --- a/app/Http/Middleware/CheckLocale.php +++ b/app/Http/Middleware/CheckLocale.php @@ -25,7 +25,7 @@ class CheckLocale \App::setLocale($request->user()->locale); // App setting preference - } elseif (\App\Models\Setting::getSettings()->locale!='') { + } elseif ((\App\Models\Setting::getSettings()) && (\App\Models\Setting::getSettings()->locale!='')) { \App::setLocale(\App\Models\Setting::getSettings()->locale); // Default app setting