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

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

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