eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php
This commit is contained in:
Craig Andrews
2010-02-24 20:52:45 -05:00
parent 20d6a7caed 8914b69d50
commit c187bf5597
189 changed files with 17090 additions and 13972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Xmpp/XmppPlugin.php
View File

@@ -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;