X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Funsubscribe.php;h=fabb7148e1404a27a65b60740afced403d58bf0c;hb=1ef5cf964ef65b248dc150660124e95dcd933106;hp=c4e6b989172c67f5b8dc8029d3d26fe6456abadd;hpb=67a347bafb875be60e7554f308d80d7f0a1d2747;p=quix0rs-gnu-social.git

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index c4e6b98917..fabb7148e1 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -1,4 +1,21 @@
 <?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 class UnsubscribeAction extends Action {
 	function handle($args) {
@@ -13,23 +30,28 @@ class UnsubscribeAction extends Action {
 			common_user_error(_t('No such user.'));
 			return;
 		}
-		
+
 		$user = common_current_user();
 
 		if (!$user->isSubscribed($other)) {
 			common_server_error(_t('Not subscribed!.'));
 		}
+
+		$sub = DB_DataObject::factory('subscription');
 		
-		$sub = new 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)));
 	}
 }