From 2c57708ff2c9a837451d6eb765975ea6e4d9df82 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 26 May 2007 18:17:07 +0000 Subject: [PATCH] oi git-svn-id: file:///svn/phpbb/trunk@7688 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/includes/functions_jabber.php | 2 +- 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 {
  • [Fix] request_var should strictly return the requested number of dimensions
  • [Fix] Correct assignment of custom width to $user->img(); / Correctly display poll bars in subsilver2 (Bug #11301)
  • [Fix] Allow removing polls in prosilver
    • -
  • {Fix] Correct link to post in managing users attachments (Bug #11765)
    • +
  • [Fix] Correct link to post in managing users attachments (Bug #11765)
  • [Fix] Reload confirm screen for selecting new forum for global topic type change if not postable forum is chosen (Bug #11711)
  • [Fix] Correctly show system default color for disabled options in Internet Explorer which does not support disabled option fields
  • [Fix] Update query for custom profiles in user management used wrong order for left/right delimiter (affecting mssql) (Bug #11781)
    • 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)