[wp-cvs] wordpress/wp-includes functions.php,1.187,1.188

[Donncha O Caoimh]

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

Modified Files:
	functions.php 
Log Message:
Re-arranged where wp-mail() sets message headers


Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** functions.php	11 Oct 2004 07:00:22 -0000	1.187
--- functions.php	11 Oct 2004 12:04:37 -0000	1.188
***************
*** 1877,1890 ****
  
  function wp_mail($to, $subject, $message, $headers = '', $more = '') {
! 	if ( function_exists('mb_send_mail') )
!         {
!             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";
-             }
-             return mb_send_mail($to, $subject, $message, $headers, $more);
          }
  	else
  		return mail($to, $subject, $message, $headers, $more);
--- 1877,1887 ----
  
  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') )
+                 return mb_send_mail($to, $subject, $message, $headers, $more);
  	else
  		return mail($to, $subject, $message, $headers, $more);
***************
*** 1918,1920 ****
  }
  
! ?>
\ No newline at end of file
--- 1915,1917 ----
  }
  
! ?>