Fixing Basepath

diff --git a/src/Core/Update.php b/src/Core/Update.php
index d0521a9041e0197a2a6fa56e68c1914407554b9e..3b31b35376792fca34c2d0fc401cc380ddc935e4 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -245,7 +245,7 @@ class Update
                        $updated = true;
                };
 
-               if (self::updateConfigEntry($configCache, $configFileSaver,'system', 'basepath', BasePath::create(dirname(__DIR__)))) {
+               if (self::updateConfigEntry($configCache, $configFileSaver,'system', 'basepath', BasePath::create(dirname(__DIR__) . '/../'))) {
                        $updated = true;
                }
 
@@ -286,7 +286,7 @@ class Update
                $savedConfig = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
 
                if (!DBA::isResult($savedConfig)) {
-                       return false;
+                       $savedConfig = null;
                }
 
                if ($fileConfig !== $savedConfig['v']) {
@@ -297,6 +297,7 @@ class Update
                        $configFileSaver->addConfigValue($cat, $key, $default);
                } else {
                        Logger::info('No Difference in config found', ['cat' => $cat, 'key' => $key, 'value' => $fileConfig, 'saved' => $savedConfig['v']]);
+                       return false;
                }
 
                return true;