Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/peopletag.php b/actions/peopletag.php
index dbdcf5fbc79490ee50aeb034c27cc6f52ca830fd..ed811ce26274fcc1d56299b03d701fe05b971ceb 100644 (file)
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -62,7 +62,7 @@ class PeopletagAction extends Action
         }
     }
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -78,16 +78,15 @@ class PeopletagAction extends Action
                 $args['page'] = $this->page;
             }
             common_redirect(common_local_url('peopletag', $args), 301);
-            return false;
         }
         $this->tag = $tag;
 
         return true;
     }
 
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $this->showPage();
     }