summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-10 17:54:37 -0700
committerBrion Vibber <brion@pobox.com>2010-04-10 17:54:37 -0700
commitedd883d3b009788049a9326bd6bdcc7846f87a8a (patch)
treed8aa5c080e48da1adffc5cefdf862ebd71afe097
parent166c1edba97d065d0fd424621305fd016e644c43 (diff)
parent71c828de89d4092579470c9f2ba821ae803cb557 (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
-rw-r--r--classes/User.php5
-rw-r--r--lib/deluserqueuehandler.php10
2 files changed, 11 insertions, 4 deletions
diff --git a/classes/User.php b/classes/User.php
index 2c256301c..1928a3c62 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -548,7 +548,10 @@ class User extends Memcached_DataObject
return false;
}
- Subscription::cancel($other, $this->getProfile());
+ $self = $this->getProfile();
+ if (Subscription::exists($other, $self)) {
+ Subscription::cancel($other, $self);
+ }
$block->query('COMMIT');
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);