From fbdb3f12a1679957e8e6d0945d7db4fe8ac05af0 Mon Sep 17 00:00:00 2001 From: IceToast Date: Mon, 6 Feb 2023 20:42:17 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=9A=91=EF=B8=8F=20Set=20Theme=20to?= =?UTF-8?q?=20default=20when=20no=20setting=20or=20setting=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Providers/AppServiceProvider.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 8fae42a6..6299bf4f 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -46,9 +46,9 @@ class AppServiceProvider extends ServiceProvider } //if none of result array is true. it sets ok to false - if (! in_array(true, $result)) { + if (!in_array(true, $result)) { $ok = false; - $validator->setCustomMessages(['multiple_date_format' => 'The format must be one of '.implode(',', $parameters)]); + $validator->setCustomMessages(['multiple_date_format' => 'The format must be one of ' . implode(',', $parameters)]); } return $ok; @@ -60,7 +60,7 @@ class AppServiceProvider extends ServiceProvider view()->share('useful_links', $useful_links); } } catch (Exception $e) { - Log::error("Couldnt find useful_links. Probably the installation is not completet. ".$e); + Log::error("Couldnt find useful_links. Probably the installation is not completet. " . $e); } //only run if the installer has been executed @@ -71,12 +71,14 @@ class AppServiceProvider extends ServiceProvider config([$setting->key => $setting->value]); } - if(!file_exists(base_path('themes') . "/" . config("SETTINGS::SYSTEM:THEME"))){ + if (!file_exists(base_path('themes') . "/" . config("SETTINGS::SYSTEM:THEME"))) { config(['SETTINGS::SYSTEM:THEME' => "default"]); } - if(config('SETTINGS::SYSTEM:THEME') !== config('theme.active')){ - Theme::set(config("SETTINGS::SYSTEM:THEME"), "default"); + if (config('SETTINGS::SYSTEM:THEME') && config('SETTINGS::SYSTEM:THEME') !== config('theme.active')) { + Theme::set(config("SETTINGS::SYSTEM:THEME", "default"), "default"); + } else { + Theme::set("default", "default"); } // Set Mail Config @@ -126,7 +128,7 @@ class AppServiceProvider extends ServiceProvider } try { - $stringfromfile = file(base_path().'/.git/HEAD'); + $stringfromfile = file(base_path() . '/.git/HEAD'); $firstLine = $stringfromfile[0]; //get the string from the array