From e8a9035490a87ac9cb0c63fe4ac9b2bfc302cd8d Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 15 Jan 2015 13:35:03 +0000 Subject: [PATCH] Catch QueryException incase we're not setup. Closes #383 --- src/Providers/LoadConfigServiceProvider.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Providers/LoadConfigServiceProvider.php b/src/Providers/LoadConfigServiceProvider.php index db4ad363..9cf3221b 100644 --- a/src/Providers/LoadConfigServiceProvider.php +++ b/src/Providers/LoadConfigServiceProvider.php @@ -3,6 +3,7 @@ namespace CachetHQ\Cachet\Providers; use CachetHQ\Cachet\Models\Setting; +use Illuminate\Database\QueryException; use Illuminate\Support\ServiceProvider; class LoadConfigServiceProvider extends ServiceProvider @@ -14,10 +15,16 @@ class LoadConfigServiceProvider extends ServiceProvider */ public function boot() { - // Get app custom configuration. - $appDomain = Setting::get('app_domain'); - $appTimezone = Setting::get('app_timezone'); - $appLocale = Setting::get('app_locale'); + $appDomain = $appTimezone = $appLocale = null; + + try { + // Get app custom configuration. + $appDomain = Setting::get('app_domain'); + $appTimezone = Setting::get('app_timezone'); + $appLocale = Setting::get('app_locale'); + } catch (QueryException $e) { + // Don't throw any errors, we may not be setup yet. + } // Override default app values. $this->app->config->set('app.url', $appDomain ?: $this->app->config->get('app.url'));