X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=016fe8a2ec9f658cd16fb7060ab994fc810d1322;hb=f329d5c067f0b981fb100fafdf5ad484e5b828f7;hp=a2999ed5a566bcec3c98aac516930f71feb8eac5;hpb=53402738b53f91f980c53293b713f5faecb52b56;p=friendica.git

diff --git a/update.php b/update.php
index a2999ed5a5..016fe8a2ec 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
  *
@@ -41,6 +41,7 @@
  */
 
 use Friendica\Core\Logger;
+use Friendica\Core\Storage\Capability\ICanReadFromStorage;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\Database;
@@ -54,7 +55,7 @@ use Friendica\Model\Notification;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
-use Friendica\Model\Storage;
+use Friendica\Model\User;
 use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Worker\Delivery;
 
@@ -183,7 +184,7 @@ function update_1330()
 
 	// set the name of the storage instead of the classpath as config
 	if (!empty($currStorage)) {
-		/** @var Storage\IStorage $currStorage */
+		/** @var ICanReadFromStorage $currStorage */
 		if (!DI::config()->set('storage', 'name', $currStorage::getName())) {
 			return Update::FAILED;
 		}
@@ -989,7 +990,7 @@ function update_1434()
 
 	// in case of an empty config, set "Database" as default storage backend
 	if (empty($name)) {
-		DI::config()->set('storage', 'name', Storage\Database::getName());
+		DI::config()->set('storage', 'name', \Friendica\Core\Storage\Type\Database::getName());
 	}
 
 	// In case of a Using deprecated storage class value, set the right name for it
@@ -1000,14 +1001,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 +1054,46 @@ 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;
+}
+
+function update_1451()
+{
+	DBA::update('user', ['account-type' => User::ACCOUNT_TYPE_COMMUNITY], ['page-flags' => [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]]);
+	DBA::update('contact', ['contact-type' => Contact::TYPE_COMMUNITY], ["`forum` OR `prv`"]);
+	DBA::update('contact', ['manually-approve' => true], ['prv' => true]);
+
+	return Update::SUCCESS;
+}