Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / deluserqueuehandler.php

diff --git a/lib/deluserqueuehandler.php b/lib/deluserqueuehandler.php
index 1baaf9331f2bf7e9752ec8565ca6ab08c1efd511..65866af4184d20fe43e48fdfeeba64156a5ee46b 100644 (file)
--- a/lib/deluserqueuehandler.php
+++ b/lib/deluserqueuehandler.php
@@ -74,8 +74,13 @@ class DelUserQueueHandler extends QueueHandler
             $qm = QueueManager::get();
             $qm->enqueue($user, 'deluser');
         } else {
-            // Out of notices? Let's finish deleting this guy!
-            $user->delete();
+            // Out of notices? Let's finish deleting this profile!
+            try {
+                $user->getProfile()->delete();
+            } catch (UserNoProfileException $e) {
+                // in case a profile didn't exist for some reason, just delete the User directly
+                $user->delete();
+            }
             common_log(LOG_INFO, "User $user->id $user->nickname deleted.");
             return true;
         }