From 69107377605f64537dd6021c9256500982cafb9c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 26 Jun 2008 04:06:26 -0400 Subject: [PATCH] misunderstood host versus server darcs-hash:20080626080626-34904-e6783597cc1317894d9f6a301edf3ef69c529ce9.gz --- lib/jabber.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jabber.php b/lib/jabber.php index 364282a1c3..2e67706515 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) { -- 2.39.5