Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index 34332c7e2978ee88f805606d640587355ddc1f66..e0cec8866cd6d957894682653b4a7e7313307e27 100644 (file)
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -35,7 +35,7 @@ class FoafGroupAction extends Action
         return true;
     }
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
 
@@ -44,7 +44,6 @@ class FoafGroupAction extends Action
         if (empty($nickname_arg)) {
             // TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
         $this->nickname = common_canonical_nickname($nickname_arg);
@@ -63,7 +62,6 @@ class FoafGroupAction extends Action
         if (!$local) {
             // TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
         $this->group = User_group::getKV('id', $local->group_id);
@@ -71,7 +69,6 @@ class FoafGroupAction extends Action
         if (!$this->group) {
             // TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
         common_set_returnto($this->selfUrl());
@@ -79,9 +76,9 @@ class FoafGroupAction extends Action
         return true;
     }
 
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         header('Content-Type: application/rdf+xml');