Missed some of the references to the old TwitterApiAction - removed

9 files changed, 11 insertions, 10 deletions

diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 104b9867f..8b976bbf3 100644
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -67,8 +67,9 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
         case 'json':
             $args['id'] = $this->auth_user->id;
             $action_obj = new ApiUserShowAction();
-            $action_obj->prepare($args);
-            $action_obj->handle($args);
+            if ($action_obj->prepare($args)) {
+                $action_obj->handle($args);
+            }
             break;
         default:
             header('Content-Type: text/html; charset=utf-8');
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index 1ebfc9e8f..df9f0c949 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiFriendshipsExistsAction extends TwitterApiAction
+class ApiFriendshipsExistsAction extends ApiAction
 {
     var $user_a = null;
     var $user_b = null;
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index a0f04ed76..070927b1e 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupListAllAction extends TwitterApiAction
+class ApiGroupListAllAction extends ApiAction
 {
     var $page     = null;
     var $count    = null;
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index da510ff26..0e9510d71 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupMembershipAction extends TwitterApiAction
+class ApiGroupMembershipAction extends ApiAction
 {
     var $page     = null;
     var $count    = null;
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index cdaf707aa..262fe6718 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupShowAction extends TwitterApiAction
+class ApiGroupShowAction extends ApiAction
 {
     var $group = null;
 
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index ac1bb1a5b..cd5b86cf9 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiHelpTestAction extends TwitterApiAction
+class ApiHelpTestAction extends ApiAction
 {
 
     /**
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 6fb65331f..356942a85 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -47,7 +47,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusnetConfigAction extends TwitterApiAction
+class ApiStatusnetConfigAction extends ApiAction
 {
     var $keys = array(
         'site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index 2cd99edb7..fb632fd93 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusnetVersionAction extends TwitterApiAction
+class ApiStatusnetVersionAction extends ApiAction
 {
     /**
      * Take arguments for running
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index 1cd0cdfd5..442efc194 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiUserShowAction extends TwitterApiAction
+class ApiUserShowAction extends ApiAction
 {
     var $user   = null;