From 212cd710aa3cd3af4f5dfbee9eb9e90a8228b6c6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 8 Jan 2017 18:42:46 +0000
Subject: [PATCH] Fixed default empty app settings effecting blank app color

Fixes #265
---
 app/Services/SettingService.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/Services/SettingService.php b/app/Services/SettingService.php
index bf5fa918e..1dc30f8a0 100644
--- a/app/Services/SettingService.php
+++ b/app/Services/SettingService.php
@@ -38,6 +38,7 @@ class SettingService
      */
     public function get($key, $default = false)
     {
+        if ($default === false) $default = config('setting-defaults.' . $key, false);
         $value = $this->getValueFromStore($key, $default);
         return $this->formatValue($value, $default);
     }
@@ -69,14 +70,6 @@ class SettingService
             return $value;
         }
 
-        // Check the defaults set in the app config.
-        $configPrefix = 'setting-defaults.' . $key;
-        if (config()->has($configPrefix)) {
-            $value = config($configPrefix);
-            $this->cache->forever($cacheKey, $value);
-            return $value;
-        }
-
         return $default;
     }