X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=59340eed83c84dfe7281048e7145d5f61964b2a8;hb=35995633ae6f5737a324f9023b0648f01883d1d1;hp=14219bcdcb3b7280d8c18159a25ab0e4da3785b2;hpb=4246ffc892d13fc7dd0057d8358fcacc44da5048;p=friendica.git

diff --git a/update.php b/update.php
index 14219bcdcb..59340eed83 100644
--- a/update.php
+++ b/update.php
@@ -1333,3 +1333,47 @@ function update_1520(): int
 
 	return Update::SUCCESS;
 }
+
+/**
+ * user-contact.remote_self was wrongly declared as boolean, possibly truncating integer values from contact.remote_self
+ *
+ * @return int
+ * @throws Exception
+ */
+function update_1524(): int
+{
+	$contacts = DBA::select('contact', ['uid', 'uri-id', 'remote_self'], ["`uid` != ?", 0]);
+	while ($contact = DBA::fetch($contacts)) {
+		Contact\User::insertForContactArray($contact);
+	}
+
+	return Update::SUCCESS;
+}
+
+function update_1525(): int
+{
+	// Use expected value for user.username
+	if (!DBA::e('UPDATE `user` u
+    JOIN `profile` p
+    ON p.`uid` = u.`uid`
+    SET u.`username` = p.`name`
+    WHERE p.`name` != ""')) {
+		return Update::FAILED;
+	}
+
+	// Blank out deprecated field profile.name to avoid future confusion
+	if (!DBA::e('UPDATE `profile` p
+    SET p.`name` = ""')) {
+		return Update::FAILED;
+	}
+
+	// Update users' self-contact name if needed
+	if (!DBA::e('UPDATE `contact` c
+    JOIN `user` u
+    ON u.`uid` = c.`uid` AND c.`self` = 1
+    SET c.`name` = u.`username`')) {
+		return Update::FAILED;
+	}
+
+	return Update::SUCCESS;
+}