Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/subscribepeopletag.php b/actions/subscribepeopletag.php
index dee0384c5d04040004887ab948ec5d1067e7667d..ed9f282cfdd241bf504cdc539dab6f3c30cc5618 100644 (file)
--- a/actions/subscribepeopletag.php
+++ b/actions/subscribepeopletag.php
@@ -50,21 +50,19 @@ class SubscribepeopletagAction extends Action
     /**
      * Prepare to run
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
             // TRANS: Client error displayed when trying to perform an action while not logged in.
             $this->clientError(_('You must be logged in to unsubscribe from a list.'));
-            return false;
         }
         // Only allow POST requests
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             // TRANS: Client error displayed when trying to use another method than POST.
             $this->clientError(_('This action only accepts POST requests.'));
-            return false;
         }
 
         // CSRF protection
@@ -75,7 +73,6 @@ class SubscribepeopletagAction 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 false;
         }
 
         $tagger_arg = $this->trimmed('tagger');
@@ -83,20 +80,18 @@ class SubscribepeopletagAction extends Action
 
         $id = intval($this->arg('id'));
         if ($id) {
-            $this->peopletag = Profile_list::staticGet('id', $id);
+            $this->peopletag = Profile_list::getKV('id', $id);
         } else {
             // TRANS: Client error displayed when trying to perform an action without providing an ID.
             $this->clientError(_('No ID given.'), 404);
-            return false;
         }
 
         if (!$this->peopletag || $this->peopletag->private) {
             // TRANS: Client error displayed trying to reference a non-existing list.
             $this->clientError(_('No such list.'), 404);
-            return false;
         }
 
-        $this->tagger = Profile::staticGet('id', $this->peopletag->tagger);
+        $this->tagger = Profile::getKV('id', $this->peopletag->tagger);
 
         return true;
     }
@@ -111,7 +106,7 @@ class SubscribepeopletagAction extends Action
      * @return void
      */
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -140,7 +135,7 @@ class SubscribepeopletagAction extends Action
             $lf = new UnsubscribePeopletagForm($this, $this->peopletag);
             $lf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('peopletagsubscribers',
                                 array('tagger' => $this->tagger->nickname,