misunderstood host versus server

darcs-hash:20080626080626-34904-e6783597cc1317894d9f6a301edf3ef69c529ce9.gz

diff --git a/lib/jabber.php b/lib/jabber.php
index 364282a1c34dbee1f7928b1c22763a866f5d1202..2e6770651525d5bff90a102163b0da2da0f2e23e 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -40,14 +40,14 @@ function jabber_normalize_jid($jid) {
 function jabber_connect($resource=NULL, $status=NULL) {
        static $conn = NULL;
        if (!$conn) {
-               $conn = new XMPP(common_config('xmpp', 'server'),
-                                            common_config('xmpp', 'port'),
+               $conn = new XMPP(common_config('xmpp', 'host') ?
+                                        common_config('xmpp', 'host') :
+                                        common_config('xmpp', 'server'),
+                                        common_config('xmpp', 'port'),
                                             common_config('xmpp', 'user'),
                                             common_config('xmpp', 'password'),
                                         ($resource) ? $resource :
                                                common_config('xmpp', 'resource'),
-                                        common_config('xmpp', 'host') ?
-                                        common_config('xmpp', 'host') :
                                         common_config('xmpp', 'server'));
 
                if (!$conn) {