Missed some of the references to the old TwitterApiAction - removed

diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 104b9867fd881e361c36d2be6fbaf0c2da21a70f..8b976bbf3d08646f87a2afe882c69abebc5d1c64 100644 (file)
--- 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 1ebfc9e8fd31858fcf29485a82149e9e9163e547..df9f0c949c9cd1596c23bad984999e32a156e568 100644 (file)
--- 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 a0f04ed760f3d38e12e1cf65dcb9c0d9834cbba1..070927b1eae792552d697194f553e3951a78cac2 100644 (file)
--- 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 da510ff26b71c1fa681275b9e61c1510e8d89ae5..0e9510d713700db2eebe34ea427319763a13f72f 100644 (file)
--- 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 cdaf707aa99132b842615fea8d2ecdbc1eb2a360..262fe671844453b66056a7ffb97bc42487eb0287 100644 (file)
--- 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 ac1bb1a5b3a0581e9be0634023d490584c5648dc..cd5b86cf931f2f16ed5b74f23298a38eab1cf544 100644 (file)
--- 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 6fb65331f4da54e0af7cdd8d35bed7717965eadd..356942a859ee646ba2318c22391ae5aa4fa341a5 100644 (file)
--- 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 2cd99edb7a83b9cdb91db91eed780b36623bea19..fb632fd93bd208b46cfc401f4e2187f73c26b77d 100644 (file)
--- 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 1cd0cdfd5fa634c1d2de98930ef6052335cd3b54..442efc194366bd424a995a83756125356e4abbcb 100644 (file)
--- 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;
 

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 31e75221be85ef98a7255fd63c89138d09319efb..9a750bbc8da020378611c320912500c58be9d70a 100644 (file)
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -240,11 +240,11 @@ class RealtimePlugin extends Plugin
         // FIXME: this code should be abstracted to a neutral third
         // party, like Notice::asJson(). I'm not sure of the ethics
         // of refactoring from within a plugin, so I'm just abusing
-        // the TwitterApiAction method. Don't do this unless you're me!
+        // the ApiAction method. Don't do this unless you're me!
 
         require_once(INSTALLDIR.'/lib/api.php');
 
-        $act = new TwitterApiAction('/dev/null');
+        $act = new ApiAction('/dev/null');
 
         $arr = $act->twitter_status_array($notice, true);
         $arr['url'] = $notice->bestUrl();