summaryrefslogtreecommitdiff
path: root/actions/twitapiblocks.php
diff options
context:
space:
mode:
authorEvan Prodromou <git@evanprodromou.name>2009-01-23 08:58:31 +0100
committerEvan Prodromou <git@evanprodromou.name>2009-01-23 08:58:31 +0100
commita7c85bebd5be9ea019a8c80d74730d7eb28d4651 (patch)
treec3fdf9575a342624bc71aad1d439ae73594f558c /actions/twitapiblocks.php
parent4873277b58941ae6ec16543f437f4267ccab5ac0 (diff)
parent7aa496cd8a939960eeaf79f3397f6fe94097e047 (diff)
Merge branch 'master' of /var/www/mublog
Conflicts: actions/api.php actions/deletenotice.php actions/recoverpassword.php actions/remotesubscribe.php actions/tag.php actions/tagrss.php actions/twitapiaccount.php actions/twitapiusers.php classes/Notice.php classes/User.php lib/common.php lib/language.php lib/subs.php lib/twitterapi.php lib/util.php scripts/inbox_users.php scripts/update_translations.php Merged development trunk into laconica head. woohoo!
Diffstat (limited to 'actions/twitapiblocks.php')
-rw-r--r--actions/twitapiblocks.php33
1 files changed, 18 insertions, 15 deletions
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 4852ff938..8135adef3 100644
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -21,17 +21,19 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php');
-class TwitapiblocksAction extends TwitterapiAction {
+class TwitapiblocksAction extends TwitterapiAction
+{
- function create($args, $apidata) {
+ function create($args, $apidata)
+ {
- parent::handle($args);
+ parent::handle($args);
- $blockee = $this->get_user($apidata['api_arg'], $apidata);
+ $blockee = $this->get_user($apidata['api_arg'], $apidata);
if (!$blockee) {
- $this->client_error('Not Found', 404, $apidata['content-type']);
- return;
+ $this->clientError('Not Found', 404, $apidata['content-type']);
+ return;
}
$user = $apidata['user'];
@@ -42,17 +44,18 @@ class TwitapiblocksAction extends TwitterapiAction {
$this->show_profile($blockee, $type);
$this->end_document($type);
} else {
- common_server_error(_('Block user failed.'));
+ $this->serverError(_('Block user failed.'));
}
- }
+ }
- function destroy($args, $apidata) {
- parent::handle($args);
- $blockee = $this->get_user($apidata['api_arg'], $apidata);
+ function destroy($args, $apidata)
+ {
+ parent::handle($args);
+ $blockee = $this->get_user($apidata['api_arg'], $apidata);
if (!$blockee) {
- $this->client_error('Not Found', 404, $apidata['content-type']);
- return;
+ $this->clientError('Not Found', 404, $apidata['content-type']);
+ return;
}
$user = $apidata['user'];
@@ -63,7 +66,7 @@ class TwitapiblocksAction extends TwitterapiAction {
$this->show_profile($blockee, $type);
$this->end_document($type);
} else {
- common_server_error(_('Unblock user failed.'));
+ $this->serverError(_('Unblock user failed.'));
}
- }
+ }
} \ No newline at end of file