Merge remote-tracking branch 'upstream/develop' into user-defined-channels

[friendica.git] / src / Core / Update.php

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 03badb1b5d8a6cadb283a1a32cfbc5590f6c3d74..2718d03d0c3318d69e33e0fd84b28e2ac325cf09 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -47,7 +47,7 @@ class Update
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function check(string $basePath, bool $via_worker, App\Mode $mode)
+       public static function check(string $basePath, bool $via_worker)
        {
                if (!DBA::connected()) {
                        return;
@@ -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);