Merge branch 'genericons-fix' into 'nightly'

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

diff --git a/actions/groupblock.php b/actions/groupblock.php
index 4bf5d74c20d4e78485d356f62bc558e0710c0744..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()) {