Merge branch 'genericons-fix' into 'nightly'

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

diff --git a/actions/block.php b/actions/block.php
index 5a8996f807e5372ce463425db30c469c009368cb..1d2910dc1914ec9ab05c1b8f1d08572439c3db9f 100644 (file)
--- a/actions/block.php
+++ b/actions/block.php
@@ -53,7 +53,7 @@ class BlockAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args = array())
     {
         if (!parent::prepare($args)) {
             return false;