Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/unsandbox.php b/actions/unsandbox.php
index b87736fcffffbf54d7537cd1a307eded9c2b7c86..1311b13f3e1231ee7ef85d6b9cc560a649202e77 100644 (file)
--- a/actions/unsandbox.php
+++ b/actions/unsandbox.php
@@ -49,7 +49,7 @@ class UnsandboxAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args = array())
     {
         if (!parent::prepare($args)) {
             return false;