9a5d37cbc5be0bae532baafeb8df0616e10f3824 from master; add UTF-8 content type to KDM...

diff --git a/ChangeLog b/ChangeLog
index 9972399c81a3f8873cb580211ed63a24609e88f1..17a774ab5ef98ef995c5b2860c3c1dbd209bea8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-05-09  Carl Hetherington  <cth@carlh.net>
 
+       * Add UTF-8 content type to KDM emails to try to fix #549.
+
        * Disable OK until a download succeeds in the certificate
        downloader (#404).
 

diff --git a/TO_PORT b/TO_PORT
index 8db0f7a2687ca82d3fbb26180f11d0cd8d3d5e13..1379650b315d085a239ebae3bbc92ac21ba83bb4 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-01919a9e691375de4eb0069bc8cf179bee4dd7b6
 1d63d0309d071254fcf4da65d3710e94fadd38e8
 0c0211871d0be5b3409adfc88d2979ca5b439b0a
 wscript/cscript etc. cleanups

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 3f88bbd9dbefe5748db4efb3a369b8b9e02d57d0..8949736f80353eb8987cb623e68bd9ca81c0e77b 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -253,6 +253,8 @@ email_kdms (
                if (!Config::instance()->kdm_bcc().empty ()) {
                        quickmail_add_bcc (mail, Config::instance()->kdm_bcc().c_str ());
                }
+
+               quickmail_add_header (mail, "Content-Type: text/plain; charset=UTF-8");
                
                string body = Config::instance()->kdm_email().c_str();
                boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());