X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=7b5f6778be7df92807978de0e88126016fa10e9f;hb=20934d73b03850e4c282fa4fab9d070c35764b1b;hp=368b70b228bb26a76dcbbea9c0b1841e09873147;hpb=516018861e011865a902587876d484d6f0f42a66;p=friendica.git

diff --git a/update.php b/update.php
index 368b70b228..7b5f6778be 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -1000,14 +1000,6 @@ function update_1434()
 	return Update::SUCCESS;
 }
 
-function update_1435()
-{
-	$contacts = DBA::select('contact', [], ["`uid` != ?", 0]);
-	while ($contact = DBA::fetch($contacts)) {
-		Contact\User::insertForContactArray($contact);
-	}
-}
-
 function update_1438()
 {
 	DBA::update('photo', ['photo-type' => Photo::USER_AVATAR], ['profile' => true]);
@@ -1061,3 +1053,37 @@ function update_1442()
 
 	return Update::SUCCESS;
 }
+
+/**
+ * A bug in Contact\User::updateByContactUpdate prevented any update to the user-contact table since the rows have been
+ * created in version 1435. This version fixes this bug but the user-contact rows are outdated, we need to regenerate
+ * them.
+ */
+function update_1444()
+{
+	DBA::e('TRUNCATE TABLE `user-contact`');
+
+	$contacts = DBA::select('contact', [], ["`uid` != ?", 0]);
+	while ($contact = DBA::fetch($contacts)) {
+		Contact\User::insertForContactArray($contact);
+	}
+
+	return Update::SUCCESS;
+}
+
+function update_1446()
+{
+	$distributed_cache_driver_source = DI::config()->getCache()->getSource('system', 'distributed_cache_driver');
+	$cache_driver_source = DI::config()->getCache()->getSource('system', 'cache_driver');
+
+	// In case the distributed cache driver is the default value, but the current cache driver isn't default,
+	// we assume that the distributed cache driver should be the same as the current cache driver
+	if (
+		$distributed_cache_driver_source === \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC
+		&& $cache_driver_source > \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC
+	) {
+		DI::config()->set('system', 'distributed_cache_driver', DI::config()->get('system', 'cache_driver'));
+	}
+
+	return Update::SUCCESS;
+}