Issue 12876 again: Delete the public contact as well

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index f7591bf4a32f91f7ae5dfe0c8e33c509eff63be9..f29934596a6a193d0de7272f1d6bd515a2cebe7f 100644 (file)
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -98,7 +98,7 @@ class ExpireAndRemoveUsers
                        // Delete the contacts of this user
                        $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
                        if (DBA::isResult($self)) {
-                               $result = DBA::delete('contact', ["`nurl` = ? AND NOT `self` AND `uid` != ?", $self['nurl'], 0]);
+                               $result = DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
                                if ($result) {
                                        Logger::debug('Deleted the user contact for other users', ['result' => $result, 'rows' => DBA::affectedRows()]);
                                } else {