diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-07-28 13:37:16 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-07-28 13:37:16 +0000 |
| commit | 1b67e804224a4477031da03ff5108c621cf6d13b (patch) | |
| tree | 4d6fc01dc442b7d0caaa0e38ac7a96cc5a597101 /phpBB/includes/functions_jabber.php | |
| parent | d8f2c4a1c4468440cf6c8657891e179bf7d222f5 (diff) | |
| download | forums-1b67e804224a4477031da03ff5108c621cf6d13b.tar forums-1b67e804224a4477031da03ff5108c621cf6d13b.tar.gz forums-1b67e804224a4477031da03ff5108c621cf6d13b.tar.bz2 forums-1b67e804224a4477031da03ff5108c621cf6d13b.tar.xz forums-1b67e804224a4477031da03ff5108c621cf6d13b.zip | |
marge
git-svn-id: file:///svn/phpbb/trunk@8696 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 310b061b90..3af7881043 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -399,13 +399,11 @@ class jabber $second_time = isset($this->session['id']); $this->session['id'] = $xml['stream:stream'][0]['@']['id']; - /** Currently commented out due to problems with some jabber server - reason unknown if ($second_time) { // If we are here for the second time after TLS, we need to continue logging in - $this->login(); - return; - }*/ + return $this->login(); + } // go on with authentication? if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls'])) |