From 13d0ff320aa66d651c613491e5ee77fc0e991c03 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 25 May 2016 11:28:03 +0100
Subject: [PATCH] Another attempt

---
 .../Providers/ConfigServiceProvider.php        | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php
index 7db50865..626dea93 100644
--- a/app/Foundation/Providers/ConfigServiceProvider.php
+++ b/app/Foundation/Providers/ConfigServiceProvider.php
@@ -38,21 +38,19 @@ class ConfigServiceProvider extends ServiceProvider
         $cache = $this->app->make(Cache::class);
         $loaded = $cache->load($env);
 
-        $this->app->terminating(function () use ($env, $repo, $cache, $loaded) {
-            if ($repo->stale() || $loaded === false) {
-                $cache->store($env, $repo->all());
+        $this->app->terminating(function () use ($repo, $cache) {
+            if ($repo->stale()) {
+                $cache->clear();
             }
         });
 
         try {
-            // Get the default settings.
-            $defaultSettings = $this->app->config->get('setting');
+            if ($loaded === false) {
+                $loaded = $repo->all();
+                $cache->store($env, $loaded);
+            }
 
-            // Get the configured settings.
-            $appSettings = $loaded === false ? $repo->all() : $loaded;
-
-            // Merge the settings
-            $settings = array_merge($defaultSettings, $appSettings);
+            $settings = array_merge($this->app->config->get('setting'), $loaded);
 
             $this->app->config->set('setting', $settings);
         } catch (Exception $e) {