aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-26 18:20:07 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-26 18:20:07 +0000
commit34326f7b0b3ea8c608cfe9255eb872da8c3d9347 (patch)
tree7c2c743d666232816618644560b579008f85bc7c
parent2c57708ff2c9a837451d6eb765975ea6e4d9df82 (diff)
downloadforums-34326f7b0b3ea8c608cfe9255eb872da8c3d9347.tar
forums-34326f7b0b3ea8c608cfe9255eb872da8c3d9347.tar.gz
forums-34326f7b0b3ea8c608cfe9255eb872da8c3d9347.tar.bz2
forums-34326f7b0b3ea8c608cfe9255eb872da8c3d9347.tar.xz
forums-34326f7b0b3ea8c608cfe9255eb872da8c3d9347.zip
oi^2
git-svn-id: file:///svn/phpbb/trunk@7689 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_jabber.php2
-rw-r--r--phpBB/includes/functions_messenger.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
index a5bcecb329..de4ea19438 100644
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -54,7 +54,7 @@ class acp_jabber
// Is this feature enabled? Then try to establish a connection
if ($jab_enable)
{
- $jabber = new jabber($jab_host, $jab_port, $jab_username, $jab_password);
+ $jabber = new jabber($jab_host, $jab_port, $jab_username, $jab_password, $jab_use_ssl);
if (!$jabber->connect())
{
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 01d8b4854f..1d2e33b661 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -458,7 +458,7 @@ class messenger
if (!$use_queue)
{
include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
- $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password']);
+ $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']);
if (!$this->jabber->connect())
{
@@ -590,7 +590,7 @@ class queue
}
include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
- $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password']);
+ $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']);
if (!$this->jabber->connect())
{