diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-07-28 13:30:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-07-28 13:30:38 +0000 |
| commit | ebc4d73930c249a695b5d5f6818c46ad032cbd75 (patch) | |
| tree | 9d261ed1a7b303a83cbe938ef19ce4a483aa059f | |
| parent | cf3d5c3416f6f1a319128568413e310ca153d87b (diff) | |
| download | forums-ebc4d73930c249a695b5d5f6818c46ad032cbd75.tar forums-ebc4d73930c249a695b5d5f6818c46ad032cbd75.tar.gz forums-ebc4d73930c249a695b5d5f6818c46ad032cbd75.tar.bz2 forums-ebc4d73930c249a695b5d5f6818c46ad032cbd75.tar.xz forums-ebc4d73930c249a695b5d5f6818c46ad032cbd75.zip | |
return jabber login status - should work... but needs testing nonetheless.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8694 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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 6cae90d1c2..773da4c6eb 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'])) |