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

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

diff --git a/actions/unsubscribepeopletag.php b/actions/unsubscribepeopletag.php
index 94434109119981ca395f84fb8bc610af7e445a76..42f0c20e6f1e75b64896b6769f3fe1a97def469f 100644 (file)
--- a/actions/unsubscribepeopletag.php
+++ b/actions/unsubscribepeopletag.php
@@ -51,21 +51,19 @@ class UnsubscribepeopletagAction 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 to a people tag.'));
-            return false;
+            $this->clientError(_('You must be logged in to unsubscribe from a list.'));
         }
         // 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
@@ -76,7 +74,6 @@ class UnsubscribepeopletagAction 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');
@@ -84,20 +81,18 @@ class UnsubscribepeopletagAction 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 people tag.
-            $this->clientError(_('No such people tag.'), 404);
-            return false;
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
         }
 
-        $this->tagger = Profile::staticGet('id', $this->peopletag->tagger);
+        $this->tagger = Profile::getKV('id', $this->peopletag->tagger);
 
         return true;
     }
@@ -111,7 +106,7 @@ class UnsubscribepeopletagAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -122,9 +117,9 @@ class UnsubscribepeopletagAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Page title for form that allows unsubscribing from a people tag.
-            // TRANS: %1$s is a nickname, %2$s is a people tag, %3$s is a tagger nickname.
-            $this->element('title', null, sprintf(_('%1$s unsubscribed to people tag %2$s by %3$s'),
+            // TRANS: Page title for form that allows unsubscribing from a list.
+            // TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
+            $this->element('title', null, sprintf(_('%1$s unsubscribed from list %2$s by %3$s'),
                                                   $cur->nickname,
                                                   $this->peopletag->tag,
                                                   $this->tagger->nickname));
@@ -133,15 +128,12 @@ class UnsubscribepeopletagAction extends Action
             $lf = new SubscribePeopletagForm($this, $this->peopletag);
             $lf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             if (common_get_returnto()) {
                 common_redirect(common_get_returnto(), 303);
-                return true;
             }
-            common_redirect(common_local_url('peopletagsbyuser',
-                                array('nickname' => $this->tagger->nickname)),
-                            303);
+            common_redirect(common_local_url('peopletagsbyuser', array('nickname' => $this->tagger->nickname)), 303);
         }
     }
 }