GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

use Subscription::cancel() to cancel all subscriptions on block

Browse Source
This commit is contained in:
Evan Prodromou 2010-03-31 15:20:16 -04:00
parent c1c7feedbd
commit d3f995846b
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/User.php
View File

@ -525,8 +525,8 @@ class User extends Memcached_DataObject
common_log(LOG_WARNING, common_log(LOG_WARNING,
sprintf( sprintf(
"Profile ID %d (%s) tried to block his or herself.", "Profile ID %d (%s) tried to block his or herself.",
$profile->id, $this->id,
$profile->nickname $this->nickname
) )
); );
return false; return false;
@ -548,13 +548,7 @@ class User extends Memcached_DataObject
return false; return false;
} }
// Cancel their subscription, if it exists Subscription::cancel($other, $this->getProfile());
$otherUser = User::staticGet('id', $other->id);
if (!empty($otherUser)) {
subs_unsubscribe_to($otherUser, $this->getProfile());
}
$block->query('COMMIT'); $block->query('COMMIT');