X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=ff3b6b536257779057e65ef59cb7a833e7826078;hb=b227d65dfc086c4d61e471360c09a34abf21a301;hp=176747057199e26fff2da3d5f41eed1124e19b24;hpb=7833da5196faf901f52b7f7ad7aa264ceab77592;p=friendica.git

diff --git a/update.php b/update.php
index 1767470571..ff3b6b5362 100644
--- a/update.php
+++ b/update.php
@@ -974,7 +974,7 @@ function update_1429()
 		return Update::FAILED;
 	}
 
-	if (!DBA::e("UPDATE `fcontact` SET `uri-id` = null WHERE NOT `uri-id` IS NULL")) {
+	if (DBStructure::existsTable('fcontact') && !DBA::e("UPDATE `fcontact` SET `uri-id` = null WHERE NOT `uri-id` IS NULL")) {
 		return Update::FAILED;
 	}
 
@@ -982,7 +982,7 @@ function update_1429()
 		return Update::FAILED;
 	}
 
-	DI::config()->set('system', 'post_update_version', 1423);
+	DI::keyValue()->set('post_update_version', 1423);
 
 	return Update::SUCCESS;
 }
@@ -1013,6 +1013,10 @@ function update_1438()
 
 function update_1439()
 {
+	if (!DBStructure::existsTable('fcontact')) {
+		return Update::SUCCESS;
+	}
+
 	$intros = DBA::select('intro', ['id', 'fid'], ["NOT `fid` IS NULL AND `fid` != ?", 0]);
 	while ($intro = DBA::fetch($intros)) {
 		$fcontact = DBA::selectFirst('fcontact', ['url'], ['id' => $intro['fid']]);
@@ -1024,6 +1028,8 @@ function update_1439()
 		}
 	}
 	DBA::close($intros);
+
+	return Update::SUCCESS;
 }
 
 function update_1440()
@@ -1132,4 +1138,30 @@ function update_1497()
 {
 	DBA::e("UPDATE `user` SET `last-activity` = DATE(`login_date`) WHERE `last-activity` IS NULL");
 	return Update::SUCCESS;
-}
\ No newline at end of file
+}
+
+function update_1502()
+{
+	DBA::e("UPDATE `pconfig` SET `cat` = 'calendar' WHERE `k` = 'first_day_of_week'");
+	return Update::SUCCESS;
+}
+
+function update_1505()
+{
+	$conditions = [
+		"(`cat` = ?) AND ((`k` LIKE ?) OR (`k` = ?) OR (`k` LIKE ?) OR (`k` = ?))",
+		"system",
+		"post_update_%",
+		"worker_last_cleaned",
+		"last%",
+		"worker_daemon_mode",
+	];
+
+	$postUpdateEntries = DBA::selectToArray('config', ['k', 'v'], $conditions);
+
+	foreach ($postUpdateEntries as $postUpdateEntry) {
+		DI::keyValue()->set($postUpdateEntry['k'], $postUpdateEntry['v']);
+	}
+
+	return DBA::delete('config', $conditions) ? Update::SUCCESS : Update::FAILED;
+}