Merge pull request #9959 from annando/more-database-stuff

[friendica.git] / src / Worker / MergeContact.php

diff --git a/src/Worker/MergeContact.php b/src/Worker/MergeContact.php
index 7a4c07540b2e2347b233f1020dc2971843dbe14b..ee66abed372315e0a8dbf4a35eb2de31c8de0dd3 100644 (file)
--- a/src/Worker/MergeContact.php
+++ b/src/Worker/MergeContact.php
@@ -23,6 +23,7 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\Database\DBStructure;
 use Friendica\Model\Post;
 
 class MergeContact
@@ -48,6 +49,12 @@ class MergeContact
                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) {
@@ -56,6 +63,16 @@ class MergeContact
                        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]);
+                       }
+                       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?
                }