aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_messenger.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-06-09 23:46:39 +0000
committerNils Adermann <naderman@naderman.de>2006-06-09 23:46:39 +0000
commitace2ee4eeccbcf0f09633f6c60dbedc39da565e7 (patch)
tree04ad237b5ef08b09ade20c7c165eb5f31881585a /phpBB/includes/functions_messenger.php
parent06981cb97bd6b8252f5ad5a65672390c33a12deb (diff)
downloadforums-ace2ee4eeccbcf0f09633f6c60dbedc39da565e7.tar
forums-ace2ee4eeccbcf0f09633f6c60dbedc39da565e7.tar.gz
forums-ace2ee4eeccbcf0f09633f6c60dbedc39da565e7.tar.bz2
forums-ace2ee4eeccbcf0f09633f6c60dbedc39da565e7.tar.xz
forums-ace2ee4eeccbcf0f09633f6c60dbedc39da565e7.zip
This looks a bit like an ugly hack, I know :(
But hopefully it will solve most of our encoding problems with jabber [Bug #1585] git-svn-id: file:///svn/phpbb/trunk@6034 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
-rw-r--r--phpBB/includes/functions_messenger.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index e4e035a9a4..7d1334dcc1 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -425,6 +425,7 @@ class messenger
$this->jabber->username = $config['jab_username'];
$this->jabber->password = $config['jab_password'];
$this->jabber->resource = ($config['jab_resource']) ? $config['jab_resource'] : '';
+ $this->jabber->encoding = $this->encoding;
if (!$this->jabber->connect())
{
@@ -441,7 +442,7 @@ class messenger
foreach ($addresses as $address)
{
- $this->jabber->send_message($address, 'normal', NULL, array('body' => htmlentities($this->msg)));
+ $this->jabber->send_message($address, 'normal', NULL, array('body' => $this->msg));
}
sleep(1);