Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / profileformaction.php

diff --git a/lib/profileformaction.php b/lib/profileformaction.php
index e340627e9d6b84fc31b571695851a33f11bdb376..a42df95bd6bbe0c856f2aa8bb693c53df4d10cd3 100644 (file)
--- a/lib/profileformaction.php
+++ b/lib/profileformaction.php
@@ -51,7 +51,7 @@ class ProfileFormAction extends RedirectingAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);