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

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ostatustag.php

diff --git a/plugins/OStatus/actions/ostatustag.php b/plugins/OStatus/actions/ostatustag.php
index 15392855cbd9ff461dddc093d29aa891cc34678a..d054c3e59f646e6cc89796cb143749f57d1aae48 100644 (file)
--- a/plugins/OStatus/actions/ostatustag.php
+++ b/plugins/OStatus/actions/ostatustag.php
@@ -31,14 +31,13 @@ class OStatusTagAction extends OStatusInitAction
     var $profile;
     var $err;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         if (common_logged_in()) {
             // TRANS: Client error displayed when trying to list a local object as if it is remote.
             $this->clientError(_m('You can use the local list functionality!'));
-            return false;
         }
 
         $this->nickname = $this->trimmed('nickname');