Merge commit 'refs/merge-requests/199' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php
index 6b9c358e7b79df590c9f4d5c88dd787cef5c8442..60fed1e3c58215a6fd1ee98640615b4984d128e4 100644 (file)
--- a/actions/apiaccountupdateprofile.php
+++ b/actions/apiaccountupdateprofile.php
@@ -52,7 +52,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -92,7 +92,6 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
         if (empty($profile)) {
             // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
-            return;
         }
 
         $original = clone($profile);
@@ -128,7 +127,6 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
             common_log_db_error($profile, 'UPDATE', __FILE__);
             // TRANS: Server error displayed if a user profile could not be saved.
             $this->serverError(_('Could not save profile.'));
-            return;
         }
 
         $twitter_user = $this->twitterUserArray($profile, true);