Remove unnecessary requires

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

diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index e389ddec84f43b2bf44428d7bbf99314e19eed6c..24aa619bd71ff00abe81b9b7c6fba1f87763e04e 100644 (file)
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
-
 /**
  * Action for outputting search results in Twitter compatible Atom
  * format.

diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 741ed78d6388cc19ccfa98979cc5d6a9e601341e..b5c006aa7b9f85f86463b30e9cb61dbcbccc54f6 100644 (file)
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
 require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
 
 /**

diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 779405e6d64c7a41d2e88f77e9a0915691ca5350..5a04569a22d8d8fbb3d474ee83bbd378678912cc 100644 (file)
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
-
 /**
  *  Returns the top ten queries that are currently trending
  *

diff --git a/lib/apiauth.php b/lib/apiauth.php
index 25e2196cf2c4bc0e004d5eb930146961c35112ab..5090871cfe18a931600558e06c202b68e437d08b 100644 (file)
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -38,7 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
 require_once INSTALLDIR . '/lib/apioauth.php';
 
 /**

diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index a33dfc7360a82e1ffd40be0df97019e402f46b65..b809c1b8e2e11d086af84e63eefd247966ce073b 100644 (file)
--- 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 6c212453e4455d12499690e2d83b7b984d70c724..2b3cb35f1d370dcc8b3b6c5421b3129956bcd032 100644 (file)
--- 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);