From 7d88b800b8a942557893458d2401ec2a8ed2aa02 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 25 Mar 2019 20:53:46 +0100
Subject: [PATCH] Fixing Basepath

---
 src/Core/Update.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Core/Update.php b/src/Core/Update.php
index d0521a9041..3b31b35376 100644
--- 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;