X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=81e5be8d649875be0c76d4810003ba5cc909e72f;hb=f245fdaa5dbc0898c89a3f2656e8f5c2def89c29;hp=a2999ed5a566bcec3c98aac516930f71feb8eac5;hpb=87673fd0c52b40d1100fd46c648c786bab3750cf;p=friendica.git

diff --git a/update.php b/update.php
index a2999ed5a5..81e5be8d64 100644
--- a/update.php
+++ b/update.php
@@ -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,6 @@ use Friendica\Model\Notification;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
-use Friendica\Model\Storage;
 use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Worker\Delivery;
 
@@ -183,7 +183,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 +989,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 +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,20 @@ 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;
+}