diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-02-24 20:52:45 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-02-24 20:52:45 -0500 |
commit | c187bf55974347f7ddb4f28714af57861dce8f08 (patch) | |
tree | 4398b456d88ce79977959b25ba1a0f6fe0c1d77f /plugins/Xmpp | |
parent | 20d6a7caed6636c28cc7b95c584549691dff4388 (diff) | |
parent | 8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
Diffstat (limited to 'plugins/Xmpp')
-rw-r--r-- | plugins/Xmpp/XmppPlugin.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index b9551b852..9557f392b 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -34,6 +34,8 @@ if (!defined('STATUSNET')) { exit(1); } +set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/XMPPHP'); + /** * Plugin for XMPP * @@ -106,12 +108,15 @@ class XmppPlugin extends ImPlugin switch ($cls) { + case 'XMPPHP_XMPP': + require_once 'XMPP.php'; + return false; case 'Sharing_XMPP': case 'Fake_XMPP': - include_once $dir . '/'.$cls.'.php'; + require_once $dir . '/'.$cls.'.php'; return false; case 'XmppManager': - include_once $dir . '/'.strtolower($cls).'.php'; + require_once $dir . '/'.strtolower($cls).'.php'; return false; default: return true; |