diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
| commit | 91d0c8b3bf41dfed42d8e33595c0e530a431db1c (patch) | |
| tree | 025fdf94609a4875d691f3580c5bee7ef407f9bc /phpBB/includes/functions_jabber.php | |
| parent | f2ba40f294d8e9e75a3adb78eedb2dc47633043e (diff) | |
| download | forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.gz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.bz2 forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.xz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.zip | |
merge again, revisions 8516 to 8525
git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 72dbbd2869..310b061b90 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -399,12 +399,13 @@ 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; - } + }*/ // go on with authentication? if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls'])) |