[Hotfix] v0.9.2 (#726)

Ctrlpanel-gg · Feb 6, 2023 · a4c2fa2 · a4c2fa2
2 parents f6c8eec + fbdb3f1
commit a4c2fa2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -46,9 +46,9 @@ public function boot()
             }
 
             //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 @@ public function boot()
                 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 @@ public function boot()
                 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 @@ public function boot()
             }
 
             try {
-                $stringfromfile = file(base_path().'/.git/HEAD');
+                $stringfromfile = file(base_path() . '/.git/HEAD');
 
                 $firstLine = $stringfromfile[0]; //get the string from the array
 

diff --git a/config/app.php b/config/app.php
@@ -4,7 +4,7 @@
 
 return [
 
-    'version' => '0.9.1',
+    'version' => '0.9.2',
 
     /*
     |--------------------------------------------------------------------------