wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'statusnet/testing' into testing

Browse Source
This commit is contained in:
James Walker 2010-02-26 03:27:40 -05:00
commit 85b5b4b40a
9 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/apistatusnetconfig.php
View File

@ -32,8 +32,6 @@ if (!defined('STATUSNET')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/api.php';
/** /**
* Gives a full dump of configuration variables for this instance * Gives a full dump of configuration variables for this instance
* of StatusNet, minus variables that may be security-sensitive (like * of StatusNet, minus variables that may be security-sensitive (like

2
actions/twitapisearchatom.php
View File

@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR.'/lib/api.php';
/** /**
* Action for outputting search results in Twitter compatible Atom * Action for outputting search results in Twitter compatible Atom
* format. * format.

1
actions/twitapisearchjson.php
View File

@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR.'/lib/api.php';
require_once INSTALLDIR.'/lib/jsonsearchresultslist.php'; require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
/** /**

2
actions/twitapitrends.php
View File

@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR.'/lib/api.php';
/** /**
* Returns the top ten queries that are currently trending * Returns the top ten queries that are currently trending
* *

0
lib/api.php → lib/apiaction.php
View File

1
lib/apiauth.php
View File

@ -38,7 +38,6 @@ if (!defined('STATUSNET')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/api.php';
require_once INSTALLDIR . '/lib/apioauth.php'; require_once INSTALLDIR . '/lib/apioauth.php';
/** /**

6
lib/profilequeuehandler.php
View File

@ -39,7 +39,11 @@ class ProfileQueueHandler extends QueueHandler
if (Event::handle('StartBroadcastProfile', array($profile))) { if (Event::handle('StartBroadcastProfile', array($profile))) {
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
omb_broadcast_profile($profile); try {
omb_broadcast_profile($profile);
} catch (Exception $e) {
common_log(LOG_ERR, "Failed sending OMB profiles: " . $e->getMessage());
}
} }
Event::handle('EndBroadcastProfile', array($profile)); Event::handle('EndBroadcastProfile', array($profile));
return true; return true;

2
plugins/Mapstraction/map.php
View File

@ -142,8 +142,6 @@ class MapAction extends OwnerDesignAction
// of refactoring from within a plugin, so I'm just abusing // of refactoring from within a plugin, so I'm just abusing
// the ApiAction 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 ApiAction('/dev/null'); $act = new ApiAction('/dev/null');
$arr = $act->twitterStatusArray($notice, true); $arr = $act->twitterStatusArray($notice, true);

2
plugins/Realtime/RealtimePlugin.php
View File

@ -244,8 +244,6 @@ class RealtimePlugin extends Plugin
// of refactoring from within a plugin, so I'm just abusing // of refactoring from within a plugin, so I'm just abusing
// the ApiAction 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 ApiAction('/dev/null'); $act = new ApiAction('/dev/null');
$arr = $act->twitterStatusArray($notice, true); $arr = $act->twitterStatusArray($notice, true);