Merge branch 'genericons-fix' into 'nightly'

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

diff --git a/actions/groupblock.php b/actions/groupblock.php
index 1c6ccb9e59605ae00349f9a89f709fab2671b7a4..43fa1f52d50d8e45d05634fb8fac869d83628f05 100644 (file)
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -52,7 +52,7 @@ class GroupblockAction extends RedirectingAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
         if (!common_logged_in()) {
@@ -110,9 +110,9 @@ class GroupblockAction extends RedirectingAction
      *
      * @return void
      */
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if ($this->arg('no')) {
                 $this->returnToPrevious();
@@ -205,7 +205,6 @@ class GroupblockAction extends RedirectingAction
         if (empty($block)) {
             // TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
             $this->serverError(_("Database error blocking user from group."));
-            return false;
         }
 
         $this->returnToPrevious();