Merge branch '0.9.x' into 1.0.x

Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php

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;