diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-26 18:17:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-26 18:17:07 +0000 |
| commit | 2c57708ff2c9a837451d6eb765975ea6e4d9df82 (patch) | |
| tree | 8494b9d8d609a7ae0295865642af986a959bb4ac | |
| parent | 1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9 (diff) | |
| download | forums-2c57708ff2c9a837451d6eb765975ea6e4d9df82.tar forums-2c57708ff2c9a837451d6eb765975ea6e4d9df82.tar.gz forums-2c57708ff2c9a837451d6eb765975ea6e4d9df82.tar.bz2 forums-2c57708ff2c9a837451d6eb765975ea6e4d9df82.tar.xz forums-2c57708ff2c9a837451d6eb765975ea6e4d9df82.zip | |
oi
git-svn-id: file:///svn/phpbb/trunk@7688 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | 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 { <li>[Fix] request_var should strictly return the requested number of dimensions</li> <li>[Fix] Correct assignment of custom width to $user->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) |