summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJames Walker <walkah@walkah.net>2010-02-26 03:27:40 -0500
committerJames Walker <walkah@walkah.net>2010-02-26 03:27:40 -0500
commit85b5b4b40aac2017496d4597674f857c8692881a (patch)
treeea42dcd78ff7bfce9d40d29edc9556ef2ca22883 /plugins
parent84d0c865c4c2dd597e249c76fa1429175f5461a1 (diff)
parente650794300f48f75cc4a91ac86d7e7dd9e082136 (diff)
Merge remote branch 'statusnet/testing' into testing
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Mapstraction/map.php2
-rw-r--r--plugins/Realtime/RealtimePlugin.php2
2 files changed, 0 insertions, 4 deletions
diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index a33dfc736..b809c1b8e 100644
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -142,8 +142,6 @@ class MapAction extends OwnerDesignAction
// of refactoring from within a plugin, so I'm just abusing
// the ApiAction method. Don't do this unless you're me!
- require_once(INSTALLDIR.'/lib/api.php');
-
$act = new ApiAction('/dev/null');
$arr = $act->twitterStatusArray($notice, true);
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 6c212453e..2b3cb35f1 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -244,8 +244,6 @@ class RealtimePlugin extends Plugin
// of refactoring from within a plugin, so I'm just abusing
// the ApiAction method. Don't do this unless you're me!
- require_once(INSTALLDIR.'/lib/api.php');
-
$act = new ApiAction('/dev/null');
$arr = $act->twitterStatusArray($notice, true);