Merge branch 'master' of /var/www/trunk

[quix0rs-gnu-social.git] / actions / twitapiusers.php

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 4644e6be661cced35ca6d58a218f78c78c92fece..ed2417561157241e8af434dc9b427f68ee68c7f5 100644 (file)
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -21,14 +21,15 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiusersAction extends TwitterapiAction {
+class TwitapiusersAction extends TwitterapiAction
+{
 
     function show($args, $apidata)
     {
         parent::handle($args);
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
@@ -43,7 +44,7 @@ class TwitapiusersAction extends TwitterapiAction {
 
         if (!$user) {
             // XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
-            $this->client_error(_('Not found.'), 404, $apidata['content-type']);
+            $this->clientError(_('Not found.'), 404, $apidata['content-type']);
             return;
         }