summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-01-08 08:27:57 +0000
committeralecpl <alec@alec.pl>2010-01-08 08:27:57 +0000
commit57837fd6892aed4ad03f250e120f2b2c79e8a5a5 (patch)
tree99c58cccbd6d042d283b5aa02968055c706e31db
parent892af478694f19d292769a02fe2820736bd29508 (diff)
- Bug in spellchecker suggestions when server charset != UTF8 (#1486406)
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/spell_googie.inc4
-rw-r--r--program/steps/mail/spell_pspell.inc2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0ecd1c69f..12a5d31aa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Bug in spellchecker suggestions when server charset != UTF8 (#1486406)
- Managesieve: Fix requires generation for multiple actions (#1486397)
- Fix LDAP problem with special characters in RDN (#1486320)
- Improved handling of message parts of type message/rfc822
diff --git a/program/steps/mail/spell_googie.inc b/program/steps/mail/spell_googie.inc
index 06c050882..28d339d41 100644
--- a/program/steps/mail/spell_googie.inc
+++ b/program/steps/mail/spell_googie.inc
@@ -48,7 +48,7 @@ if ($fp = fsockopen($host, $port, $errno, $errstr, 30))
$out = "POST $path HTTP/1.0\r\n";
$out .= "Host: $host\r\n";
$out .= "Content-Length: " . strlen($data) . "\r\n";
- $out .= "Content-type: application/x-www-form-urlencoded\r\n";
+ $out .= "Content-Type: application/x-www-form-urlencoded\r\n";
$out .= "Connection: Close\r\n\r\n";
$out .= $data;
fwrite($fp, $out);
@@ -58,6 +58,8 @@ if ($fp = fsockopen($host, $port, $errno, $errstr, 30))
fclose($fp);
}
+// Don't use server's default Content-Type charset (#1486406)
+header("Content-Type: text/xml; charset=".RCMAIL_CHARSET);
print $store;
exit;
diff --git a/program/steps/mail/spell_pspell.inc b/program/steps/mail/spell_pspell.inc
index 0abdc9ea1..578bfe523 100644
--- a/program/steps/mail/spell_pspell.inc
+++ b/program/steps/mail/spell_pspell.inc
@@ -71,7 +71,7 @@ foreach ($words as $w) {
$out .= '</spellresult>';
-header("Content-Type: text/xml");
+header("Content-Type: text/xml; charset=".RCMAIL_CHARSET);
echo $out;
exit;