diff options
author | Brion Vibber <brion@pobox.com> | 2010-04-10 17:56:11 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-04-10 17:56:11 -0700 |
commit | 1eeb23e1e3b77de056791a74cd3e4f5c02d68510 (patch) | |
tree | a636518ebfc9bf41c2b0b0a916c14f1ee37df634 /lib | |
parent | af06c554a0d8c4eeab801a9550d951845d40350a (diff) | |
parent | edd883d3b009788049a9326bd6bdcc7846f87a8a (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
actions/confirmaddress.php
Diffstat (limited to 'lib')
-rw-r--r-- | lib/deluserqueuehandler.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/deluserqueuehandler.php b/lib/deluserqueuehandler.php index 4a1233a5e..710303938 100644 --- a/lib/deluserqueuehandler.php +++ b/lib/deluserqueuehandler.php @@ -49,9 +49,13 @@ class DelUserQueueHandler extends QueueHandler return true; } - if (!$user->hasRole(Profile_role::DELETED)) { - common_log(LOG_INFO, "User {$user->nickname} is not pending deletion; aborting."); - return true; + try { + if (!$user->hasRole(Profile_role::DELETED)) { + common_log(LOG_INFO, "User {$user->nickname} is not pending deletion; aborting."); + return true; + } + } catch (UserNoProfileException $unp) { + common_log(LOG_INFO, "Deleting user {$user->nickname} with no profile... probably a good idea!"); } $notice = $this->getNextBatch($user); |