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

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

diff --git a/actions/register.php b/actions/register.php
index 7e48df9ac7d9efd0d92be90d3e663fed70a9ce01..f030c279d878c8f6083915a94baf188b049b1aa5 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -120,7 +120,7 @@ class RegisterAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -236,7 +236,7 @@ class RegisterAction extends Action
                                                     'homepage' => $homepage,
                                                     'bio' => $bio,
                                                     'location' => $location,
-                                                    'code' => $code))) {
+                                                    'code' => $code));
                     // success!
                     if (!common_set_user($user)) {
                         // TRANS: Server error displayed when saving fails during user registration.