diff options
| author | Evan Prodromou <evan@controlezvous.ca> | 2008-06-26 04:06:26 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlezvous.ca> | 2008-06-26 04:06:26 -0400 |
| commit | 69107377605f64537dd6021c9256500982cafb9c (patch) | |
| tree | 839ffd999f559f0147ba37ed2cc2955c3ec0a68b | |
| parent | 85fd47aa520dd41365b25a2db6ef996940ed1a9b (diff) | |
misunderstood host versus server
darcs-hash:20080626080626-34904-e6783597cc1317894d9f6a301edf3ef69c529ce9.gz
| -rw-r--r-- | lib/jabber.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/jabber.php b/lib/jabber.php index 364282a1c..2e6770651 100644 --- 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) { |