Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / UserFlag / actions / adminprofileflag.php

diff --git a/plugins/UserFlag/actions/adminprofileflag.php b/plugins/UserFlag/actions/adminprofileflag.php
index b7538c6663368b5c99b06d7d07ea28f4f391fd7d..4ba69bcc631918e20edfbb6ede42308a328fa667 100644 (file)
--- a/plugins/UserFlag/actions/adminprofileflag.php
+++ b/plugins/UserFlag/actions/adminprofileflag.php
@@ -52,7 +52,7 @@ class AdminprofileflagAction extends Action
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -63,7 +63,6 @@ class AdminprofileflagAction extends Action
         if (!common_logged_in()) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_m('Not logged in.'));
-            return;
         }
 
         $user = common_current_user();
@@ -88,7 +87,6 @@ class AdminprofileflagAction extends Action
         if (!$user->hasRight(UserFlagPlugin::REVIEWFLAGS)) {
             // TRANS: Error message displayed when trying to review profile flags while not authorised.
             $this->clientError(_m('You cannot review profile flags.'));
-            return false;
         }
 
         $this->page = $this->trimmed('page');
@@ -109,7 +107,7 @@ class AdminprofileflagAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);