mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

#25095

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8516 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-04-21 11:11:08 +00:00
parent 71d725ae91
commit 0bb09825c8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View File

@ -96,6 +96,7 @@
<li>[Change] Sort the tables at the database table backup screen</li> <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] 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] 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> </ul>
<a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3>

3
phpBB/includes/functions_jabber.php
View File

@ -399,12 +399,13 @@ class jabber
$second_time = isset($this->session['id']); $second_time = isset($this->session['id']);
$this->session['id'] = $xml['stream:stream'][0]['@']['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 ($second_time)
{ {
// If we are here for the second time after TLS, we need to continue logging in // If we are here for the second time after TLS, we need to continue logging in
$this->login(); $this->login();
return; return;
} }*/
// go on with authentication? // go on with authentication?
if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls'])) if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls']))