[wp-cvs] wordpress wp-login.php, 1.33, 1.34 wp-register.php, 1.20, 1.21

[Matthew Mullenweg]

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

Modified Files:
	wp-login.php wp-register.php 
Log Message:
Use mb_mail_send if available.

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** wp-login.php	4 Oct 2004 06:45:01 -0000	1.33
--- wp-login.php	4 Oct 2004 07:44:04 -0000	1.34
***************
*** 149,153 ****
  	$message .= get_settings('siteurl') . '/wp-login.php';
  
! 	$m = mail($user_email, sprintf(__("[%s] Your login and password"), get_settings('blogname')), $message);
  
  	if ($m == false) {
--- 149,153 ----
  	$message .= get_settings('siteurl') . '/wp-login.php';
  
! 	$m = wp_mail($user_email, sprintf(__("[%s] Your login and password"), get_settings('blogname')), $message);
  
  	if ($m == false) {
***************
*** 159,163 ****
          echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
  		// send a copy of password change notification to the admin
! 		mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login));
  		die();
  	}
--- 159,163 ----
          echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
  		// send a copy of password change notification to the admin
! 		wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login));
  		die();
  	}

Index: wp-register.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-register.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wp-register.php	16 Sep 2004 10:26:39 -0000	1.20
--- wp-register.php	4 Oct 2004 07:44:04 -0000	1.21
***************
*** 104,108 ****
  	$message  = sprintf(__("New user registration on your blog %1\$s:\n\nLogin: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email);
  
! 	@mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);
  
  	?>
--- 104,108 ----
  	$message  = sprintf(__("New user registration on your blog %1\$s:\n\nLogin: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email);
  
! 	@wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);
  
  	?>