X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FMergeContact.php;h=2378d98e173f07ce0a9789855d5e82a03737da6e;hb=34030a736d5e0aa2195c0f472cf69f863c161d83;hp=ee66abed372315e0a8dbf4a35eb2de31c8de0dd3;hpb=d666b6cb42a1b0d46e9fae914a803fbd5e10e2ab;p=friendica.git

diff --git a/src/Worker/MergeContact.php b/src/Worker/MergeContact.php
index ee66abed37..2378d98e17 100644
--- a/src/Worker/MergeContact.php
+++ b/src/Worker/MergeContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,7 +24,6 @@ namespace Friendica\Worker;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
-use Friendica\Model\Post;
 
 class MergeContact
 {
@@ -44,34 +43,29 @@ class MergeContact
 
 		Logger::info('Handling duplicate', ['search' => $old_cid, 'replace' => $new_cid]);
 
-		// Search and replace
-		Post::update(['contact-id' => $new_cid], ['contact-id' => $old_cid]);
+		foreach (['item', 'thread', 'post-user', 'post-thread-user'] as $table) {
+			if (DBStructure::existsTable($table)) {
+				DBA::update($table, ['contact-id' => $new_cid], ['contact-id' => $old_cid]);
+			}
+		}
 		DBA::update('mail', ['contact-id' => $new_cid], ['contact-id' => $old_cid]);
 		DBA::update('photo', ['contact-id' => $new_cid], ['contact-id' => $old_cid]);
 		DBA::update('event', ['cid' => $new_cid], ['cid' => $old_cid]);
-		if (DBStructure::existsTable('item')) {
-			DBA::update('item', ['contact-id' => $new_cid], ['contact-id' => $old_cid]);
-		}
-		if (DBStructure::existsTable('thread')) {
-			DBA::update('thread', ['contact-id' => $new_cid], ['contact-id' => $old_cid]);
-		}
 
 		// These fields only contain public contact entries (uid = 0)
 		if ($uid == 0) {
 			DBA::update('post-tag', ['cid' => $new_cid], ['cid' => $old_cid]);
 			DBA::delete('post-tag', ['cid' => $old_cid]);
-			Post::update(['author-id' => $new_cid], ['author-id' => $old_cid]);
-			Post::update(['owner-id' => $new_cid], ['owner-id' => $old_cid]);
-			Post::update(['causer-id' => $new_cid], ['causer-id' => $old_cid]);
-			if (DBStructure::existsTable('item')) {
-				DBA::update('item', ['author-id' => $new_cid], ['author-id' => $old_cid]);
-				DBA::update('item', ['owner-id' => $new_cid], ['owner-id' => $old_cid]);
-				DBA::update('item', ['causer-id' => $new_cid], ['causer-id' => $old_cid]);
+			foreach (['item', 'post', 'post-thread', 'post-user', 'post-thread-user'] as $table) {
+				if (DBStructure::existsTable($table)) {
+					DBA::update($table, ['author-id' => $new_cid], ['author-id' => $old_cid]);
+					DBA::update($table, ['owner-id' => $new_cid], ['owner-id' => $old_cid]);
+					DBA::update($table, ['causer-id' => $new_cid], ['causer-id' => $old_cid]);
+				}
 			}
 			if (DBStructure::existsTable('thread')) {
 				DBA::update('thread', ['author-id' => $new_cid], ['author-id' => $old_cid]);
 				DBA::update('thread', ['owner-id' => $new_cid], ['owner-id' => $old_cid]);
-				DBA::update('thread', ['causer-id' => $new_cid], ['causer-id' => $old_cid]);
 			}
 		} else {
 			/// @todo Check if some other data needs to be adjusted as well, possibly the "rel" status?