X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUpdate.php;h=2718d03d0c3318d69e33e0fd84b28e2ac325cf09;hb=5ae03319936f70d12eaf4a09dfcda020de429380;hp=eb207b6c25a21c9925ac14fc25849dfd17567930;hpb=baf3225916dc44cca95aaf5a6c2d73b1a037b90a;p=friendica.git diff --git a/src/Core/Update.php b/src/Core/Update.php index eb207b6c25..2718d03d0c 100644 --- a/src/Core/Update.php +++ b/src/Core/Update.php @@ -132,12 +132,9 @@ class Update $build = DI::config()->get('system', 'build'); if (empty($build)) { - // legacy option - check if there's something in the Config table - if (DBStructure::existsTable('config')) { - $dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']); - if (!empty($dbConfig)) { - $build = $dbConfig['v']; - } + $dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']); + if (!empty($dbConfig)) { + $build = $dbConfig['v']; } if (empty($build) || ($build > DB_UPDATE_VERSION)) { @@ -162,10 +159,20 @@ class Update // Checks if the build changed during Lock acquiring (so no double update occurs) $retryBuild = DI::config()->get('system', 'build'); - if ($retryBuild !== $build) { - Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]); - DI::lock()->release('dbupdate'); - return ''; + if ($retryBuild != $build) { + // legacy option - check if there's something in the Config table + if (DBStructure::existsTable('config')) { + $dbConfig = DBA::selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'build']); + if (!empty($dbConfig)) { + $retryBuild = intval($dbConfig['v']); + } + } + + if ($retryBuild != $build) { + Logger::notice('Update already done.', ['from' => $build, 'retry' => $retryBuild, 'to' => $current]); + DI::lock()->release('dbupdate'); + return ''; + } } DI::config()->set('system', 'maintenance', 1);