- Bug in spellchecker suggestions when server charset != UTF8 (#1486406)

git-svn-id: https://svn.roundcube.net/trunk@3194 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 4 insertions, 2 deletions

diff --git a/roundcubemail/program/steps/mail/spell_googie.inc b/roundcubemail/program/steps/mail/spell_googie.inc
index 06c050882..28d339d41 100644
--- a/roundcubemail/program/steps/mail/spell_googie.inc
+++ b/roundcubemail/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/roundcubemail/program/steps/mail/spell_pspell.inc b/roundcubemail/program/steps/mail/spell_pspell.inc
index 0abdc9ea1..578bfe523 100644
--- a/roundcubemail/program/steps/mail/spell_pspell.inc
+++ b/roundcubemail/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;