From 437f96e57345639d5f455ec7e22db36b4ccca994 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 18 Mar 2021 15:56:50 +0000
Subject: [PATCH] Partly restored functionality

---
 src/Worker/ExpireAndRemoveUsers.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index 949b7dea9f..0941480d44 100644
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -58,6 +58,12 @@ class ExpireAndRemoveUsers
 			Photo::delete(['uid' => $user['uid']]);
 
 			// Delete the contacts of this user
+			$self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
+			if (DBA::isResult($self)) {
+				DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
+			}
+
+			// Delete all contacts of this user
 			DBA::delete('contact', ['uid' => $user['uid']]);
 
 			// These tables contain the permissionset which will also be deleted when a user is deleted.