[php-blog-cvs] serendipity/include functions.inc.php,1.21,1.22

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28184

Modified Files:
	functions.inc.php 
Log Message:
Funny mb_encode_mimeheader bug. Thanks a lot to Mark Kronsbein!
(Fixes bug #1144300)


Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- functions.inc.php	3 Feb 2005 18:04:40 -0000	1.21
+++ functions.inc.php	19 Feb 2005 12:02:41 -0000	1.22
@@ -173,8 +173,11 @@
 
     /* Check for mb_* function, and use it to encode headers etc. */
     if ( function_exists('mb_encode_mimeheader') ) {
-        $subject = mb_encode_mimeheader($subject, LANG_CHARSET);
-        $fromName = mb_encode_mimeheader($fromName, LANG_CHARSET);
+        // Funky mb_encode_mimeheader function insertes linebreaks after 74 chars.
+        // Most MTA I've personally spoken with told me they don't like this at all. ;)
+        // Regards to Mark Kronsbein for finding this issue!
+        $subject = str_replace(array("\n", "\r"), array('', ''), mb_encode_mimeheader($subject, LANG_CHARSET));
+        $fromName = str_replace(array("\n", "\r"), array('', ''), mb_encode_mimeheader($fromName, LANG_CHARSET));
     }