diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
commit | b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3 (patch) | |
tree | f63f4f3e93bad7611f4b5651171fc5122ec65455 /actions/apiaccountupdateprofile.php | |
parent | 3b6f738ab73b7f77dd09ac21dd9446876776fc04 (diff) | |
parent | ca489631db840e33757a71a7e4cb56b187c182d3 (diff) |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
Diffstat (limited to 'actions/apiaccountupdateprofile.php')
-rw-r--r-- | actions/apiaccountupdateprofile.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php index 92d0f6b77..aea10e33e 100644 --- a/actions/apiaccountupdateprofile.php +++ b/actions/apiaccountupdateprofile.php @@ -43,10 +43,8 @@ require_once INSTALLDIR . '/lib/apiauth.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiAccountUpdateProfileAction extends ApiAuthAction { - /** * Take arguments for running * @@ -55,7 +53,6 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction * @return boolean success flag * */ - function prepare($args) { parent::prepare($args); @@ -79,7 +76,6 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -103,6 +99,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction } if (empty($this->user)) { + // TRANS: Client error displayed if a user could not be found. $this->clientError(_('No such user.'), 404, $this->format); return; } @@ -110,6 +107,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { + // TRANS: Client error displayed if a user profile could not be found. $this->clientError(_('User has no profile.')); return; } @@ -145,6 +143,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction if (!$result) { 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; } @@ -163,5 +162,4 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction $this->endDocument('json'); } } - } |