forked from GNUsocial/gnu-social
Add backwards compatibility for the XMPP configuration before XMPP was made into a plugin
This commit is contained in:
parent
914bc9f9c5
commit
0651404000
@ -274,7 +274,6 @@ class StatusNet
|
||||
}
|
||||
|
||||
// Backwards compatibility
|
||||
|
||||
if (array_key_exists('memcached', $config)) {
|
||||
if ($config['memcached']['enabled']) {
|
||||
addPlugin('Memcache', array('servers' => $config['memcached']['server']));
|
||||
@ -284,6 +283,21 @@ class StatusNet
|
||||
$config['cache']['base'] = $config['memcached']['base'];
|
||||
}
|
||||
}
|
||||
if (array_key_exists('xmpp', $config)) {
|
||||
if ($config['xmpp']['enabled']) {
|
||||
addPlugin('xmpp', array(
|
||||
'server' => $config['xmpp']['server'],
|
||||
'port' => $config['xmpp']['port'],
|
||||
'user' => $config['xmpp']['user'],
|
||||
'resource' => $config['xmpp']['resource'],
|
||||
'encryption' => $config['xmpp']['encryption'],
|
||||
'password' => $config['xmpp']['password'],
|
||||
'host' => $config['xmpp']['host'],
|
||||
'debug' => $config['xmpp']['debug'],
|
||||
'public' => $config['xmpp']['public']
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user