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/apiblockcreate.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/apiblockcreate.php')
| -rw-r--r-- | actions/apiblockcreate.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php index 53844cd2f..a9f31e791 100644 --- a/actions/apiblockcreate.php +++ b/actions/apiblockcreate.php @@ -46,7 +46,6 @@ 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 ApiBlockCreateAction extends ApiAuthAction { var $other = null; @@ -59,7 +58,6 @@ class ApiBlockCreateAction extends ApiAuthAction * @return boolean success flag * */ - function prepare($args) { parent::prepare($args); @@ -79,7 +77,6 @@ class ApiBlockCreateAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -103,6 +100,7 @@ class ApiBlockCreateAction extends ApiAuthAction if ($this->user->id == $this->other->id) { $this->clientError( + // TRANS: Client error displayed when users try to block themselves. _("You cannot block yourself!"), 403, $this->format @@ -124,10 +122,8 @@ class ApiBlockCreateAction extends ApiAuthAction $this->showProfile($this->other, $this->format); $this->endDocument($this->format); } else { + // TRANS: Server error displayed when blocking a user has failed. $this->serverError(_('Block user failed.'), 500, $this->format); } - } - } - |