Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23289/include
Modified Files:
functions.inc.php
Log Message:
- Correctly send charset in mail headers
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- functions.inc.php 29 Dec 2004 19:09:59 -0000 1.15
+++ functions.inc.php 1 Jan 2005 18:12:54 -0000 1.16
@@ -168,10 +168,11 @@
$message .= "\n" . sprintf(SIGNATURE, $serendipity['blogTitle']);
/* Always add these headers */
+ $headers[] = 'From: '. $fromName .' <'. $fromMail .'>';
$headers[] = 'X-Mailer: Serendipity/'. $serendipity['version'];
$headers[] = 'X-Engine: PHP/'. phpversion();
- $headers[] = 'Content-Type: text/plain; charset=' . LANG_CHARSET;
- $headers[] = 'From: '. $fromName .' <'. $fromMail .'>';
+ $headers[] = 'MIME-Version: 1.0';
+ $headers[] = 'Content-Type: text/plain; charset="' . LANG_CHARSET .'"';
if ( function_exists('mb_send_mail') ) {
$funcSend = 'mb_send_mail';
|