From 40949eaa90749c3a38a92ba4cd967fe36dc66969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 20 Sep 2016 20:58:52 +0200 Subject: [PATCH] FIX: fix update from migrations --- app/Providers/TemplateServiceProvider.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/Providers/TemplateServiceProvider.php b/app/Providers/TemplateServiceProvider.php index 08d6d0ac..d4ff4457 100644 --- a/app/Providers/TemplateServiceProvider.php +++ b/app/Providers/TemplateServiceProvider.php @@ -14,12 +14,16 @@ class TemplateServiceProvider extends ServiceProvider private function getTemplate() { // select template - $template = Module::where('is_template', true) - ->where('enabled', true) - ->first(); + try { + $template = Module::where('is_template', true) + ->where('enabled', true) + ->first(); - if ($template) { - $template->settings = json_decode($template->module_settings); + if ($template) { + $template->settings = json_decode($template->module_settings); + } + } catch (\Exception $e) { + return null; } return $template;