wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Brion Vibber 2010-04-10 17:54:37 -07:00
commit edd883d3b0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/User.php
View File

@ -548,7 +548,10 @@ class User extends Memcached_DataObject
return false; return false;
} }
Subscription::cancel($other, $this->getProfile()); $self = $this->getProfile();
if (Subscription::exists($other, $self)) {
Subscription::cancel($other, $self);
}
$block->query('COMMIT'); $block->query('COMMIT');

10
lib/deluserqueuehandler.php
View File

@ -49,9 +49,13 @@ class DelUserQueueHandler extends QueueHandler
return true; return true;
} }
if (!$user->hasRole(Profile_role::DELETED)) { try {
common_log(LOG_INFO, "User {$user->nickname} is not pending deletion; aborting."); if (!$user->hasRole(Profile_role::DELETED)) {
return true; 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); $notice = $this->getNextBatch($user);