diff options
| author | Evan Prodromou <evan@status.net> | 2010-10-22 09:24:49 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-10-22 09:24:49 -0400 |
| commit | e1e79e62360191626fbb3eae9f5d2af249780ac9 (patch) | |
| tree | b9b56dd72d03bcbb71120cc81ac04f002acb531f /actions/apiblockdestroy.php | |
| parent | 13571b32eaa60f09f906296fec1d5d63749eb132 (diff) | |
| parent | d6f4588b9ede2cb26b06084b3117ec9184f9e64e (diff) | |
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'actions/apiblockdestroy.php')
| -rw-r--r-- | actions/apiblockdestroy.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php index 871ce66c7..b69907784 100644 --- a/actions/apiblockdestroy.php +++ b/actions/apiblockdestroy.php @@ -45,7 +45,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 ApiBlockDestroyAction extends ApiAuthAction { var $other = null; @@ -58,7 +57,6 @@ class ApiBlockDestroyAction extends ApiAuthAction * @return boolean success flag * */ - function prepare($args) { parent::prepare($args); @@ -78,7 +76,6 @@ class ApiBlockDestroyAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -112,10 +109,8 @@ class ApiBlockDestroyAction extends ApiAuthAction $this->showProfile($this->other, $this->format); $this->endDocument($this->format); } else { + // TRANS: Server error displayed when unblocking a user has failed. $this->serverError(_('Unblock user failed.')); } - } - } - |