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 0f0484b4e7efb1764d03a54c5d81f46cdcfc9c0a..2718d03d0c3318d69e33e0fd84b28e2ac325cf09 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -132,19 +132,13 @@ class Update
                $build = DI::config()->get('system', 'build');
 
                if (empty($build)) {
-                       // legacy option - check if the Config table exists
-                       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)) {
-                               // legacy option - check if the Config table exists
-                               if (DBStructure::existsTable('config')) {
-                                       DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1);
-                               }
+                               DI::config()->set('system', 'build', DB_UPDATE_VERSION - 1);
                                $build = DB_UPDATE_VERSION - 1;
                        }
                }