[wp-cvs] wordpress/wp-includes functions.php,1.253,1.254

[Matthew Mullenweg]

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

Modified Files:
	functions.php 
Log Message:
Mail and reset fixes

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.253
retrieving revision 1.254
diff -C2 -d -r1.253 -r1.254
*** functions.php	6 Feb 2005 18:21:20 -0000	1.253
--- functions.php	7 Feb 2005 06:43:18 -0000	1.254
***************
*** 1571,1581 ****
  
  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') )
!                 return mb_send_mail($to, $subject, $message, $headers, $more);
  	else
  		return mail($to, $subject, $message, $headers, $more);
--- 1571,1581 ----
  
  function wp_mail($to, $subject, $message, $headers = '', $more = '') {
! 	if( $headers == '' ) {
! 		$headers = "MIME-Version: 1.0\n" .
! 		"Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
! 	}
! 
  	if ( function_exists('mb_send_mail') )
! 		return mb_send_mail($to, $subject, $message, $headers, $more);
  	else
  		return mail($to, $subject, $message, $headers, $more);