Revert #5007 as it causes more trouble than it solves. Fixes #5273 for trunk.

git-svn-id: http://svn.automattic.com/wordpress/trunk@6599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-01-11 18:44:44 +00:00
parent fcbe872299
commit 8c45b3a029

View File

@ -238,7 +238,6 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
// Set the from name and email // Set the from name and email
$phpmailer->From = apply_filters( 'wp_mail_from', $from_email ); $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
$phpmailer->Sender = apply_filters( 'wp_mail_from', $from_email );
$phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name ); $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
// Set destination address // Set destination address