aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/docs/CHANGELOG.html2
-rw-r--r--phpBB/includes/functions_jabber.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index d830d88e21..ae05133a23 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -220,7 +220,7 @@ p a {
<li>[Fix] request_var should strictly return the requested number of dimensions</li>
<li>[Fix] Correct assignment of custom width to $user-&gt;img(); / Correctly display poll bars in subsilver2 (Bug #11301)</li>
<li>[Fix] Allow removing polls in prosilver</li>
- <li>{Fix] Correct link to post in managing users attachments (Bug #11765)</li>
+ <li>[Fix] Correct link to post in managing users attachments (Bug #11765)</li>
<li>[Fix] Reload confirm screen for selecting new forum for global topic type change if not postable forum is chosen (Bug #11711)</li>
<li>[Fix] Correctly show system default color for disabled options in Internet Explorer which does not support disabled option fields</li>
<li>[Fix] Update query for custom profiles in user management used wrong order for left/right delimiter (affecting mssql) (Bug #11781)</li>
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 3ad96df928..4b9928089e 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -42,7 +42,7 @@ class jabber
$this->port = ($port) ? $port : 5222;
$this->username = $username;
$this->password = $password;
- $this->use_ssl = ($use_ssl && $this->can_use_ssl) ? true : false;
+ $this->use_ssl = ($use_ssl && $this->can_use_ssl()) ? true : false;
// Change port if we use SSL
if ($this->port == 5222 && $this->use_ssl)