diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 11:11:08 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 11:11:08 +0000 |
| commit | 0bb09825c8714338d03f861e83fa811c1dd5e4af (patch) | |
| tree | d76516cbe898879c72797589a6c57414f4f23e34 /phpBB | |
| parent | 71d725ae9116972c1135771f04f3fb73251d9bfa (diff) | |
| download | forums-0bb09825c8714338d03f861e83fa811c1dd5e4af.tar forums-0bb09825c8714338d03f861e83fa811c1dd5e4af.tar.gz forums-0bb09825c8714338d03f861e83fa811c1dd5e4af.tar.bz2 forums-0bb09825c8714338d03f861e83fa811c1dd5e4af.tar.xz forums-0bb09825c8714338d03f861e83fa811c1dd5e4af.zip | |
#25095
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8516 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3c03801b23..11b348949d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -96,6 +96,7 @@ <li>[Change] Sort the tables at the database table backup screen</li> <li>[Fix] Update correct theme for cached styles in style.php (Bug #25805)</li> <li>[Fix] Also add PHPBB_INSTALLED check to download/file.php for inline avatar delivery</li> + <li>[Fix] Unable to login to some jabber server, reverted previous change (Bug #25095)</li> </ul> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 7633c10be9..6cae90d1c2 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'])) |