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

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

diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php
index 8192e86b44fd4246c932136a92f6c01eee9f5022..ee33517fdab1606e8c711487cc8209f6209c995c 100644 (file)
--- a/actions/removepeopletag.php
+++ b/actions/removepeopletag.php
@@ -66,7 +66,7 @@ class RemovepeopletagAction extends Action
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -120,7 +120,7 @@ class RemovepeopletagAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         // Throws exception on error
 
@@ -129,7 +129,7 @@ class RemovepeopletagAction extends Action
 
         if (!$ptag) {
             $user = User::getKV('id', $this->tagged->id);
-            if ($user) {
+            if ($user instanceof User) {
                 $this->clientError(
                         // TRANS: Client error displayed when an unknown error occurs while delisting a user.
                         // TRANS: %s is a username.