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

Use addPlugin! (esp. XMPP folks should do this)

Browse Source 
If you're using XMPP by setting $config['xmpp'][*] then you should do:

    addPlugin('Xmpp', $config['xmpp']);

because setting it directly in $config[''] won't do anything.

Also, default resource for XMPP is now 'gnusocial'. If you want something
more random, set it in your addPlugin config array.
This commit is contained in:
Mikael Nordfeldth
2013-10-30 12:25:01 +01:00
parent 8dafce34c3
commit e45edd6ae2
3 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/statusnet.php
View File

@@ -379,33 +379,6 @@ class StatusNet
$config_files);
}
// Backwards compatibility
if (array_key_exists('memcached', $config)) {
if ($config['memcached']['enabled']) {
addPlugin('Memcache', array('servers' => $config['memcached']['server']));
}
if (!empty($config['memcached']['base'])) {
$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']
));
}
}
// Check for database server; must exist!
if (empty($config['db']['database'])) {