[wp-cvs] wordpress/wp-includes functions.php,1.219,1.220

[Donncha O Caoimh]

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30860

Modified Files:
	functions.php 
Log Message:
Fixed mangled email headers, thanks to John Allman


Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.219
retrieving revision 1.220
diff -C2 -d -r1.219 -r1.220
*** functions.php	4 Dec 2004 00:12:08 -0000	1.219
--- functions.php	8 Dec 2004 14:40:40 -0000	1.220
***************
*** 1123,1129 ****
  	}
  
! 	$message_headers = "MIME-Version: 1.0\r\n"
! 		. "$from\r\n"
! 		. "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
  
  	@wp_mail($user->user_email, $subject, $notify_message, $message_headers);
--- 1123,1129 ----
  	}
  
! 	$message_headers = "MIME-Version: 1.0\n"
! 		. "$from\n"
! 		. "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
  
  	@wp_mail($user->user_email, $subject, $notify_message, $message_headers);
***************
*** 1166,1172 ****
      $from  = "From: $admin_email";
  
!     $message_headers = "MIME-Version: 1.0\r\n"
!     	. "$from\r\n"
!     	. "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
  
      @wp_mail($admin_email, $subject, $notify_message, $message_headers);
--- 1166,1172 ----
      $from  = "From: $admin_email";
  
!     $message_headers = "MIME-Version: 1.0\n"
!     	. "$from\n"
!     	. "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
  
      @wp_mail($admin_email, $subject, $notify_message, $message_headers);
***************
*** 1945,1951 ****
  function wp_mail($to, $subject, $message, $headers = '', $more = '') {
          if( $headers == '' ) {
!                 $headers = "MIME-Version: 1.0\r\n" .
!                            "From: " . $to . " <" . $to . ">\r\n" .
!                            "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
          }
  	if ( function_exists('mb_send_mail') )
--- 1945,1951 ----
  function wp_mail($to, $subject, $message, $headers = '', $more = '') {
          if( $headers == '' ) {
!                 $headers = "MIME-Version: 1.0\n" .
!                            "From: " . $to . " <" . $to . ">\n" .
!                            "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
          }
  	if ( function_exists('mb_send_mail') )