X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveContact.php;h=00027dca40a2e46dd2b78352a274885634ff0519;hb=4c5b97834b26745fab2f23040cc3ca87686c6e87;hp=b07661b7a9068dc6cc6505887081d04e5db6ba1b;hpb=6d852ff6fd1b91a825f32bc429b031bf5d56cc9e;p=friendica.git

diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index b07661b7a9..00027dca40 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -7,20 +7,28 @@ namespace Friendica\Worker;
 
 use Friendica\Database\DBA;
 use Friendica\Core\Protocol;
-
-require_once 'include/dba.php';
+use Friendica\Model\Item;
 
 class RemoveContact {
 	public static function execute($id) {
 
-		// Only delete if the contact is archived
-		$condition = ['archive' => true, 'network' => Protocol::PHANTOM, 'id' => $id];
-		$r = DBA::exists('contact', $condition);
-		if (!DBA::isResult($r)) {
+		// Only delete if the contact is to be deleted
+		$condition = ['network' => Protocol::PHANTOM, 'id' => $id];
+		$contact = DBA::selectFirst('contact', ['uid'], $condition);
+		if (!DBA::isResult($contact)) {
 			return;
 		}
 
 		// Now we delete the contact and all depending tables
+		$condition = ['uid' => $contact['uid'], 'contact-id' => $id];
+		do {
+			$items = Item::select(['id'], $condition, ['limit' => 100]);
+			while ($item = Item::fetch($items)) {
+				DBA::delete('item', ['id' => $item['id']]);
+			}
+			DBA::close($items);
+		} while (Item::exists($condition));
+
 		DBA::delete('contact', ['id' => $id]);
 	}
 }