diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-20 23:13:02 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-20 23:13:02 -0500 |
| commit | 4b9df58c90e25ea79aeec64c6e96f828fe06d7df (patch) | |
| tree | ac237014d015535d07babba42d40d86608de0ec5 /actions/twitapiblocks.php | |
| parent | bd056218f9a595184ac7bcac0c1dc6a8981d7af2 (diff) | |
| parent | 65bfda33b8464caf14ce268c9bea2e7eceb27fe5 (diff) | |
Merge branch 'master' into groups
Conflicts:
.gitignore
Diffstat (limited to 'actions/twitapiblocks.php')
| -rw-r--r-- | actions/twitapiblocks.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php index 5d64f2f7d..8135adef3 100644 --- a/actions/twitapiblocks.php +++ b/actions/twitapiblocks.php @@ -32,7 +32,7 @@ class TwitapiblocksAction extends TwitterapiAction $blockee = $this->get_user($apidata['api_arg'], $apidata); if (!$blockee) { - $this->client_error('Not Found', 404, $apidata['content-type']); + $this->clientError('Not Found', 404, $apidata['content-type']); return; } @@ -44,7 +44,7 @@ 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.')); } } @@ -54,7 +54,7 @@ class TwitapiblocksAction extends TwitterapiAction $blockee = $this->get_user($apidata['api_arg'], $apidata); if (!$blockee) { - $this->client_error('Not Found', 404, $apidata['content-type']); + $this->clientError('Not Found', 404, $apidata['content-type']); return; } @@ -66,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 |