Commit 57dfad64 authored by Zach Copley's avatar Zach Copley

Missed some of the references to the old TwitterApiAction - removed

parent 55991882
......@@ -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');
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
* @link http://status.net/
*/
class ApiHelpTestAction extends TwitterApiAction
class ApiHelpTestAction extends ApiAction
{
/**
......
......@@ -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',
......
......@@ -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
......
......@@ -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;
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment