summaryrefslogtreecommitdiff
path: root/actions/unsubscribe.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/unsubscribe.php')
-rw-r--r--actions/unsubscribe.php24
1 files changed, 3 insertions, 21 deletions
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 3863a3a5e..5814c37bd 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -34,27 +34,9 @@ class UnsubscribeAction extends Action {
}
$other_nickname = $this->arg('unsubscribeto');
- $other = User::staticGet('nickname', $other_nickname);
- if (!$other) {
- common_user_error(_('No such user.'));
- return;
- }
-
- if (!$user->isSubscribed($other)) {
- common_server_error(_('Not subscribed!.'));
- }
-
- $sub = DB_DataObject::factory('subscription');
-
- $sub->subscriber = $user->id;
- $sub->subscribed = $other->id;
-
- $sub->find(true);
-
- // note we checked for existence above
-
- if (!$sub->delete()) {
- common_server_error(_('Couldn\'t delete subscription.'));
+ $result=subs_unsubscribe_user($user,$other_nickname);
+ if($result!=true) {
+ common_user_error($result);
return;
}