X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUpdate.php;h=a4c5cf313e7de99d3e54fb9c457f42c32236f1a0;hb=c1686c486c8fcb4f94f89df869ae72509f3583fe;hp=d440136b55a2e5aff5e0d443e3b81965245a03de;hpb=b4096251babf9d48ae3679637f3b3684ad28267a;p=friendica.git

diff --git a/src/Core/Update.php b/src/Core/Update.php
index d440136b55..a4c5cf313e 100644
--- 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;
@@ -129,15 +129,26 @@ class Update
 			DI::lock()->release('dbupdate', true);
 		}
 
+		if (!DBStructure::existsTable('config')) {
+			DBA::e(<<<EOF
+CREATE TABLE IF NOT EXISTS `config` (
+	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`cat` varbinary(50) NOT NULL DEFAULT '' COMMENT 'The category of the entry',
+	`k` varbinary(50) NOT NULL DEFAULT '' COMMENT 'The key of the entry',
+	`v` mediumtext COMMENT '',
+	 PRIMARY KEY(`id`),
+	 UNIQUE INDEX `cat_k` (`cat`,`k`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='main configuration storage';
+EOF
+);
+		}
+
 		$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,18 +173,20 @@ class Update
 
 					// Checks if the build changed during Lock acquiring (so no double update occurs)
 					$retryBuild = DI::config()->get('system', '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 = $dbConfig['v'];
+					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' => $stored, 'to' => $current]);
-						DI::lock()->release('dbupdate');
-						return '';
+						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);