From: Michael Vogel <icarus@dabo.de>
Date: Thu, 29 Aug 2019 06:41:55 +0000 (+0200)
Subject: Avoid not performing unarchiving
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=481376dd6f9ccbc54e4e302f8e08ba3f84646882;p=friendica.git

Avoid not performing unarchiving
---

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index b0e8ec6133..dfabf260de 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -903,6 +903,13 @@ class Contact extends BaseObject
 	 */
 	public static function unmarkForArchival(array $contact)
 	{
+		// Always unarchive the relay contact entry
+		if (!empty($contact['batch'])) {
+			$fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+			$condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
+			DBA::update('contact', $fields, $condition);
+		}
+
 		$condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME];
 		$exists = DBA::exists('contact', $condition);
 
@@ -926,11 +933,6 @@ class Contact extends BaseObject
 		DBA::update('contact', $fields, ['id' => $contact['id']]);
 		DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
 		GContact::updateFromPublicContactURL($contact['url']);
-
-		if (!empty($contact['batch'])) {
-			$condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
-			DBA::update('contact', $fields, $condition);
-		}
 	}
 
 	/**