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

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

diff --git a/lib/profileformaction.php b/lib/profileformaction.php
index b5f2e5d2a31232c3773d193dc2e9b3818fad4bc9..328a6680177022324db5d3623326e6f91b487063 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);
 
@@ -77,15 +77,13 @@ class ProfileFormAction extends RedirectingAction
         if (!$id) {
             // TRANS: Client error displayed when trying to change user options without specifying a user to work on.
             $this->clientError(_('No profile specified.'));
-            return false;
         }
 
-        $this->profile = Profile::staticGet('id', $id);
+        $this->profile = Profile::getKV('id', $id);
 
         if (!$this->profile) {
             // TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
             $this->clientError(_('No profile with that ID.'));
-            return false;
         }
 
         return true;
@@ -94,18 +92,20 @@ class ProfileFormAction extends RedirectingAction
     /**
      * Handle request
      *
-     * Shows a page with list of favorite notices
-     *
      * @param array $args $_REQUEST args; handled in prepare()
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->handlePost();
+            try {
+                $this->handlePost();
+            } catch (AlreadyFulfilledException $e) {
+                // 'tis alright
+            }
             $this->returnToPrevious();
         }
     }