don't check for notice in rendering content; just render it!

[quix0rs-gnu-social.git] / actions / unsubscribe.php

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index bac7523932e4e92e3eda81832f915c8430b5ea6a..fabb7148e1404a27a65b60740afced403d58bf0c 100644 (file)
--- 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)));
        }
 }