X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Funsubscribe.php;h=524fbea284183755f3279f166a8d963174573293;hb=9e89a177c76741f7e696f09d778bd8b151f84d3f;hp=8679ea6256bbf6a4b0b16b030398d7f1503b2d27;hpb=93e878d7cab25741ca7ba6d184d68c1df423164a;p=quix0rs-gnu-social.git

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 8679ea6256..524fbea284 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -44,19 +44,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class UnsubscribeAction extends Action
 {
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         if (!common_logged_in()) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return;
         }
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             common_redirect(common_local_url('subscriptions',
                                              array('nickname' => $this->scoped->nickname)));
-            return;
         }
 
         /* Use a session token for CSRF protection. */
@@ -67,7 +65,6 @@ class UnsubscribeAction extends Action
             // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token. ' .
                                  'Try again, please.'));
-            return;
         }
 
         $other_id = $this->arg('unsubscribeto');
@@ -75,7 +72,6 @@ class UnsubscribeAction extends Action
         if (!$other_id) {
             // TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
             $this->clientError(_('No profile ID in request.'));
-            return;
         }
 
         $other = Profile::getKV('id', $other_id);
@@ -83,7 +79,6 @@ class UnsubscribeAction extends Action
         if (!($other instanceof Profile)) {
             // TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
             $this->clientError(_('No profile with that ID.'));
-            return;
         }
 
         try {
@@ -102,11 +97,9 @@ class UnsubscribeAction extends Action
             $subscribe = new SubscribeForm($this, $other);
             $subscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
-            common_redirect(common_local_url('subscriptions',
-                                             array('nickname' => $this->scoped->nickname)),
-                            303);
+            common_redirect(common_local_url('subscriptions', array('nickname' => $this->scoped->nickname)), 303);
         }
     }
 }