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 1e00e6f12b80c5102ad454386d8c3acd48ca8c3b..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);
 
@@ -96,9 +96,9 @@ class ProfileFormAction extends RedirectingAction
      *
      * @return void
      */
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             try {