diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-02-05 15:34:44 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-02-05 15:34:44 +0000 |
| commit | 7126981ee497950fa0f033e32a6a8d0c150a1a62 (patch) | |
| tree | 5538391c2c9a74849dec555b8ffff648c5b171ca /wp-includes/pluggable.php | |
| parent | bd36587b32db474bd99b5cfcb7e7a4315dae9ed0 (diff) | |
| download | wordpress-mu-7126981ee497950fa0f033e32a6a8d0c150a1a62.tar.gz wordpress-mu-7126981ee497950fa0f033e32a6a8d0c150a1a62.tar.xz wordpress-mu-7126981ee497950fa0f033e32a6a8d0c150a1a62.zip | |
Merge with WP 2.3.3
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1196 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/pluggable.php')
| -rw-r--r-- | wp-includes/pluggable.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index d9dae0f..9ead34b 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -248,7 +248,6 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { // Set the from name and 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 ); // Set destination address |