merge CiaranG's changes for subs0.6.00.6

darcs-hash:20080922225031-84dde-c6967f46ae642f8943b0de77d9a82892ecadb4ce.gz

1 files changed, 3 insertions, 21 deletions

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 570c1700a..4bfaf7958 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -43,27 +43,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;
 		}