diff options
| author | Evan Prodromou <git@evanprodromou.name> | 2009-01-23 08:58:31 +0100 |
|---|---|---|
| committer | Evan Prodromou <git@evanprodromou.name> | 2009-01-23 08:58:31 +0100 |
| commit | a7c85bebd5be9ea019a8c80d74730d7eb28d4651 (patch) | |
| tree | c3fdf9575a342624bc71aad1d439ae73594f558c /actions/twitapinotifications.php | |
| parent | 4873277b58941ae6ec16543f437f4267ccab5ac0 (diff) | |
| parent | 7aa496cd8a939960eeaf79f3397f6fe94097e047 (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/twitapinotifications.php')
| -rw-r--r-- | actions/twitapinotifications.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php index 8d93309a2..411971af1 100644 --- a/actions/twitapinotifications.php +++ b/actions/twitapinotifications.php @@ -22,16 +22,19 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/twitterapi.php'); # This naming convention looks real sick -class TwitapinotificationsAction extends TwitterapiAction { +class TwitapinotificationsAction extends TwitterapiAction +{ - function follow($args, $apidata) { - parent::handle($args); - common_server_error(_('API method under construction.'), $code=501); - } + function follow($args, $apidata) + { + parent::handle($args); + $this->serverError(_('API method under construction.'), $code=501); + } - function leave($args, $apidata) { - parent::handle($args); - common_server_error(_('API method under construction.'), $code=501); - } + function leave($args, $apidata) + { + parent::handle($args); + $this->serverError(_('API method under construction.'), $code=501); + } }
\ No newline at end of file |