diff options
-rw-r--r-- | plugins/Xmpp/XmppPlugin.php | 4 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/BOSH.php (renamed from extlib/XMPPHP/BOSH.php) | 0 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/Exception.php (renamed from extlib/XMPPHP/Exception.php) | 0 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/Log.php (renamed from extlib/XMPPHP/Log.php) | 0 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/Roster.php (renamed from extlib/XMPPHP/Roster.php) | 0 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/XMLObj.php (renamed from extlib/XMPPHP/XMLObj.php) | 0 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/XMLStream.php (renamed from extlib/XMPPHP/XMLStream.php) | 0 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/XMPP.php (renamed from extlib/XMPPHP/XMPP.php) | 0 | ||||
-rw-r--r-- | plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php (renamed from extlib/XMPPHP/XMPP_Old.php) | 0 |
9 files changed, 1 insertions, 3 deletions
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index a2521536b..9d75e2475 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -34,8 +34,6 @@ if (!defined('STATUSNET')) { exit(1); } -set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/XMPPHP'); - /** * Plugin for XMPP * @@ -287,7 +285,7 @@ class XmppPlugin extends ImPlugin switch ($cls) { case 'XMPPHP_XMPP': - require_once 'XMPP.php'; + require_once $dir . '/extlib/XMPPHP/XMPP.php'; return false; case 'Sharing_XMPP': case 'Queued_XMPP': diff --git a/extlib/XMPPHP/BOSH.php b/plugins/Xmpp/extlib/XMPPHP/BOSH.php index befaf60a7..befaf60a7 100644 --- a/extlib/XMPPHP/BOSH.php +++ b/plugins/Xmpp/extlib/XMPPHP/BOSH.php diff --git a/extlib/XMPPHP/Exception.php b/plugins/Xmpp/extlib/XMPPHP/Exception.php index da59bc791..da59bc791 100644 --- a/extlib/XMPPHP/Exception.php +++ b/plugins/Xmpp/extlib/XMPPHP/Exception.php diff --git a/extlib/XMPPHP/Log.php b/plugins/Xmpp/extlib/XMPPHP/Log.php index a9bce3d84..a9bce3d84 100644 --- a/extlib/XMPPHP/Log.php +++ b/plugins/Xmpp/extlib/XMPPHP/Log.php diff --git a/extlib/XMPPHP/Roster.php b/plugins/Xmpp/extlib/XMPPHP/Roster.php index 2e459e2a2..2e459e2a2 100644 --- a/extlib/XMPPHP/Roster.php +++ b/plugins/Xmpp/extlib/XMPPHP/Roster.php diff --git a/extlib/XMPPHP/XMLObj.php b/plugins/Xmpp/extlib/XMPPHP/XMLObj.php index 0d3e21991..0d3e21991 100644 --- a/extlib/XMPPHP/XMLObj.php +++ b/plugins/Xmpp/extlib/XMPPHP/XMLObj.php diff --git a/extlib/XMPPHP/XMLStream.php b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php index d33411ec5..d33411ec5 100644 --- a/extlib/XMPPHP/XMLStream.php +++ b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php diff --git a/extlib/XMPPHP/XMPP.php b/plugins/Xmpp/extlib/XMPPHP/XMPP.php index c0f896339..c0f896339 100644 --- a/extlib/XMPPHP/XMPP.php +++ b/plugins/Xmpp/extlib/XMPPHP/XMPP.php diff --git a/extlib/XMPPHP/XMPP_Old.php b/plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php index 43f56b154..43f56b154 100644 --- a/extlib/XMPPHP/XMPP_Old.php +++ b/plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php |