Mail and reset fixes

git-svn-id: https://develop.svn.wordpress.org/trunk@2236 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Matt Mullenweg
2005-02-07 06:43:23 +00:00
parent f87c05180b
commit cb39e25512
2 changed files with 13 additions and 14 deletions

View File

@@ -1570,13 +1570,13 @@ function htmlentities2($myHTML) {
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( $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);
return mb_send_mail($to, $subject, $message, $headers, $more);
else
return mail($to, $subject, $message, $headers, $more);
}