aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_jabber.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-17 20:28:39 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-17 20:28:39 +0000
commit2043827f528c7383f2f7ef649d2937c11922b468 (patch)
tree7134ceb1ca10ad53be90075da15292830b2501e4 /phpBB/includes/acp/acp_jabber.php
parent20a27095bd93937384b2c4fcbadb7a77936a1143 (diff)
downloadforums-2043827f528c7383f2f7ef649d2937c11922b468.tar
forums-2043827f528c7383f2f7ef649d2937c11922b468.tar.gz
forums-2043827f528c7383f2f7ef649d2937c11922b468.tar.bz2
forums-2043827f528c7383f2f7ef649d2937c11922b468.tar.xz
forums-2043827f528c7383f2f7ef649d2937c11922b468.zip
hey dev team mates, here are the brand new beta checkins (as promised). Please ensure this stays in our private cvs until the 23rd June, except the bug fixes.
git-svn-id: file:///svn/phpbb/trunk@6092 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_jabber.php')
-rw-r--r--phpBB/includes/acp/acp_jabber.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
index 2799c97959..7c7e4586e0 100644
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -61,7 +61,7 @@ class acp_jabber
// try to create account if it doesn't exist
if ($jab_enable)
{
- if ($jab_host != $config['jab_host'] || $jab_username != $config['jab_username'])
+ if (($jab_host != $config['jab_host'] || $jab_username != $config['jab_username']) && $jab_username)
{
if (!$jabber->connect())
{