fix subscriptions a bit

darcs-hash:20080521185602-84dde-9e058c34c251d96cf557c1dd459523aa434bed79.gz

1 files changed, 8 insertions, 3 deletions

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index bac752393..fabb7148e 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -37,16 +37,21 @@ class UnsubscribeAction extends Action {
 			common_server_error(_t('Not subscribed!.'));
 		}
 
-		$sub = new Subscription();
+		$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(_t('Couldn\'t delete subscription.'));
 			return;
 		}
 
-		common_redirect(common_local_url('all', array('nickname' =>
-													  $user->nickname)));
+		common_redirect(common_local_url('subscriptions', array('nickname' =>
+																$user->nickname)));
 	}
 }