diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-01-28 16:08:42 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-01-28 16:08:42 -0500 |
commit | 065140400018dec28ed82fd31a754c94b7b87521 (patch) | |
tree | 90c8bb96ee4a0e1f7ebf27d856871f06dc56a6a6 | |
parent | 914bc9f9c5ce29584e00553104ac991e6e178e7b (diff) |
Add backwards compatibility for the XMPP configuration before XMPP was made into a plugin
-rw-r--r-- | lib/statusnet.php | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/statusnet.php b/lib/statusnet.php index beeb26ccc..2654ba573 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -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'] + )); + } + } } } |