From 82e7479cfec15ea42b10ef22844cc471054d5077 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 7 Mar 2018 21:01:46 +0100
Subject: [PATCH] Force fresh config var [skip ci]

---
 app/Http/Middleware/Installer.php |  2 +-
 app/Support/FireflyConfig.php     | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php
index dde7e16234..7c4516c079 100644
--- a/app/Http/Middleware/Installer.php
+++ b/app/Http/Middleware/Installer.php
@@ -54,7 +54,7 @@ class Installer
 
         // older version in config than database?
         $configVersion = intval(config('firefly.db_version'));
-        $dbVersion     = intval(FireflyConfig::get('db_version', 1)->data);
+        $dbVersion     = intval(FireflyConfig::getFresh('db_version', 1)->data);
         if ($configVersion > $dbVersion) {
             Log::warning(sprintf(
                 'The current installed version (%d) is older than the required version (%d). Redirect to migrate routine.', $dbVersion, $configVersion
diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php
index 193aa10ae0..c74febbc69 100644
--- a/app/Support/FireflyConfig.php
+++ b/app/Support/FireflyConfig.php
@@ -77,6 +77,27 @@ class FireflyConfig
         return $this->set($name, $default);
     }
 
+    /**
+     * @param      $name
+     * @param null $default
+     *
+     * @return \FireflyIII\Models\Configuration|null
+     */
+    public function getFresh($name, $default = null)
+    {
+        $config = Configuration::where('name', $name)->first(['id', 'name', 'data']);
+        if ($config) {
+
+            return $config;
+        }
+        // no preference found and default is null:
+        if (null === $default) {
+            return null;
+        }
+
+        return $this->set($name, $default);
+    }
+
     /**
      * @param $name
      * @param $value