- header encode fix: put double quotes outside the encoding. fixes evolution display

[packages/dokuwiki.git] / dokuwiki-mail-headerencodequotes.patch

--- dokuwiki/inc/mail.php~	2008-02-25 16:32:34.000000000 +0200
+++ dokuwiki/inc/mail.php	2008-02-25 16:32:58.878702838 +0200
@@ -124,7 +125,12 @@
       }
 
       if(!utf8_isASCII($text)){
-        $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
+        // put the quotes outside as in =?UTF-8?Q?"Elan Ruusam=C3=A4e"?= vs "=?UTF-8?Q?Elan Ruusam=C3=A4e?="
+        if (preg_match('/^"(.+)"$/', $text, $matches)) {
+          $text = '"=?UTF-8?Q?'.mail_quotedprintable_encode($matches[1],0).'?="';
+        } else {
+          $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
+        }
       }
     }else{
       $text = '';