friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fixing Basepath

This commit is contained in:
Philipp Holzer 2019-03-25 20:53:46 +01:00
parent d78598b64e
commit 7d88b800b8
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Update.php
View File

@ -245,7 +245,7 @@ class Update
$updated = true; $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; $updated = true;
} }
@ -286,7 +286,7 @@ class Update
$savedConfig = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]); $savedConfig = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
if (!DBA::isResult($savedConfig)) { if (!DBA::isResult($savedConfig)) {
return false; $savedConfig = null;
} }
if ($fileConfig !== $savedConfig['v']) { if ($fileConfig !== $savedConfig['v']) {
@ -297,6 +297,7 @@ class Update
$configFileSaver->addConfigValue($cat, $key, $default); $configFileSaver->addConfigValue($cat, $key, $default);
} else { } else {
Logger::info('No Difference in config found', ['cat' => $cat, 'key' => $key, 'value' => $fileConfig, 'saved' => $savedConfig['v']]); Logger::info('No Difference in config found', ['cat' => $cat, 'key' => $key, 'value' => $fileConfig, 'saved' => $savedConfig['v']]);
return false;
} }
return true; return true;