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

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

diff --git a/actions/unblock.php b/actions/unblock.php
index 82d0d32c109149f3e732754c3bfffb61fd9e0121..cb03214a9f02db44144b720e0c86da2275ed62b4 100644 (file)
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class UnblockAction extends ProfileFormAction
 {
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;