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

misunderstood host versus server

Browse Source 
darcs-hash:20080626080626-34904-e6783597cc1317894d9f6a301edf3ef69c529ce9.gz
This commit is contained in:
Evan Prodromou 2008-06-26 04:06:26 -04:00
parent 85fd47aa52
commit 6910737760
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jabber.php
View File

@ -40,14 +40,14 @@ function jabber_normalize_jid($jid) {
function jabber_connect($resource=NULL, $status=NULL) { function jabber_connect($resource=NULL, $status=NULL) {
static $conn = NULL; static $conn = NULL;
if (!$conn) { if (!$conn) {
$conn = new XMPP(common_config('xmpp', 'server'), $conn = new XMPP(common_config('xmpp', 'host') ?
common_config('xmpp', 'host') :
common_config('xmpp', 'server'),
common_config('xmpp', 'port'), common_config('xmpp', 'port'),
common_config('xmpp', 'user'), common_config('xmpp', 'user'),
common_config('xmpp', 'password'), common_config('xmpp', 'password'),
($resource) ? $resource : ($resource) ? $resource :
common_config('xmpp', 'resource'), common_config('xmpp', 'resource'),
common_config('xmpp', 'host') ?
common_config('xmpp', 'host') :
common_config('xmpp', 'server')); common_config('xmpp', 'server'));
if (!$conn) { if (!$conn) {