Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/peopletagsubscribers.php b/actions/peopletagsubscribers.php
index 123b168596c4698185ac8f2ba8c871b78cf3aa53..927cf66e6418e32e88c764832b6eb4f621dfc3c5 100644 (file)
--- a/actions/peopletagsubscribers.php
+++ b/actions/peopletagsubscribers.php
@@ -53,7 +53,7 @@ class PeopletagsubscribersAction extends Action
         return true;
     }
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -76,13 +76,11 @@ class PeopletagsubscribersAction extends Action
                 $args['page'] = $this->page;
             }
             common_redirect(common_local_url('peopletagged', $args), 301);
-            return false;
         }
 
         if (!$tagger) {
             // TRANS: Client error displayed when a tagger is expected but not provided.
             $this->clientError(_('No tagger.'), 404);
-            return false;
         }
 
         $user = User::getKV('nickname', $tagger);
@@ -90,7 +88,6 @@ class PeopletagsubscribersAction extends Action
         if (!$user) {
             // TRANS: Client error displayed trying to perform an action related to a non-existing user.
             $this->clientError(_('No such user.'), 404);
-            return false;
         }
 
         $this->tagger = $user->getProfile();
@@ -99,7 +96,6 @@ class PeopletagsubscribersAction extends Action
         if (!$this->peopletag) {
             // TRANS: Client error displayed trying to reference a non-existing list.
             $this->clientError(_('No such list.'), 404);
-            return false;
         }
 
         return true;
@@ -121,9 +117,9 @@ class PeopletagsubscribersAction extends Action
         }
     }
 
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $this->showPage();
     }
 
@@ -171,7 +167,7 @@ class PeopletagSubscriberList extends ProfileList
         $this->peopletag = $peopletag;
     }
 
-    function newListItem($profile)
+    function newListItem(Profile $profile)
     {
         return new PeopletagSubscriberListItem($profile, $this->peopletag, $this->action);
     }