X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fprofileformaction.php;h=1e00e6f12b80c5102ad454386d8c3acd48ca8c3b;hb=543d968b81b97c9ebd46de063d8d70621c12015b;hp=57065282239c2e74702931c39fcb77af6712db14;hpb=b7d07466943a73e1c009467c8daa6e499810080f;p=quix0rs-gnu-social.git diff --git a/lib/profileformaction.php b/lib/profileformaction.php index 5706528223..1e00e6f12b 100644 --- a/lib/profileformaction.php +++ b/lib/profileformaction.php @@ -59,7 +59,7 @@ class ProfileFormAction extends RedirectingAction if (!common_logged_in()) { if ($_SERVER['REQUEST_METHOD'] == 'POST') { - // TRANS: Client error displayed when trying to change user options while not logged in. + // TRANS: Error message displayed when trying to perform an action that requires a logged in user. $this->clientError(_('Not logged in.')); } else { // Redirect to login. @@ -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,8 +92,6 @@ class ProfileFormAction extends RedirectingAction /** * Handle request * - * Shows a page with list of favorite notices - * * @param array $args $_REQUEST args; handled in prepare() * * @return void @@ -105,7 +101,11 @@ class ProfileFormAction extends RedirectingAction parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->handlePost(); + try { + $this->handlePost(); + } catch (AlreadyFulfilledException $e) { + // 'tis alright + } $this->returnToPrevious(); } }