kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-17 10:13:37 +00:00
Code Issues Projects Releases Wiki Activity

Force fresh config var [skip ci]

Browse Source
This commit is contained in:
James Cole
2018-03-07 21:01:46 +01:00
parent 462fe5d89f
commit 82e7479cfe
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/Installer.php
View File

@@ -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

21
app/Support/FireflyConfig.php
View File

@@ -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