From 57837fd6892aed4ad03f250e120f2b2c79e8a5a5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 08 Jan 2010 03:27:57 -0500
Subject: [PATCH] - Bug in spellchecker suggestions when server charset != UTF8 (#1486406)

---
 CHANGELOG                           |    1 +
 program/steps/mail/spell_googie.inc |    4 +++-
 program/steps/mail/spell_pspell.inc |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0ecd1c6..12a5d31 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 06c0508..28d339d 100644
--- a/program/steps/mail/spell_googie.inc
+++ b/program/steps/mail/spell_googie.inc
@@ -48,7 +48,7 @@
   $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 @@
   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 0abdc9e..578bfe5 100644
--- a/program/steps/mail/spell_pspell.inc
+++ b/program/steps/mail/spell_pspell.inc
@@ -71,7 +71,7 @@
 
 $out .= '</spellresult>';
 
-header("Content-Type: text/xml");
+header("Content-Type: text/xml; charset=".RCMAIL_CHARSET);
 echo $out;
 exit;
 

--
Gitblit v1.9.1