- up to 2009-12-02 “Mulled Wine” (RC1)

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

diff --git a/dokuwiki-mail-headerencodequotes.patch b/dokuwiki-mail-headerencodequotes.patch
index 58f99d02e7c6fb64b782be00b8a914d3f5fc7721..3ba65fddba6ea5433b938ae6d60cb59ad1438c03 100644 (file)
--- a/dokuwiki-mail-headerencodequotes.patch
+++ b/dokuwiki-mail-headerencodequotes.patch
@@ -1,20 +1,22 @@
---- dokuwiki/inc/mail.php~     2008-02-25 16:51:02.000000000 +0200
-+++ dokuwiki/inc/mail.php      2008-02-25 16:51:07.741031127 +0200
-@@ -124,7 +125,16 @@
-       }
+--- dokuwiki/inc/mail.php~  2009-11-10 15:32:16.000000000 +0200
++++ dokuwiki/inc/mail.php   2009-11-10 15:34:00.074347495 +0200
+@@ -164,8 +164,17 @@
+             }
  
-       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).'?=';
-+        }
-+        // additionally the space character should be encoded as =20 (or each
-+        // word QP encoded separately).
-+        // however this is needed only in mail headers, not globally in mail_quotedprintable_encode().
-+        $text = str_replace(" ", "=20", $text);
-       }
-     }else{
-       $text = '';
+             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).'?=';
++                }
++                // additionally the space character should be encoded as =20 (or each
++                // word QP encoded separately).
++                // however this is needed only in mail headers, not globally in mail_quotedprintable_encode().
++                $text = str_replace(" ", "=20", $text);
++            }
+         }else{
+             $text = '';
+         }