mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-24 10:09:47 +01:00
Remove option from wp_mail(). The additional parameters argument to mail() is non-portable and not useful to us. Props: dalziel. http://mosquito.wordpress.org/view.php?id=855
git-svn-id: http://svn.automattic.com/wordpress/trunk@2365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a7110c0663
commit
c567fccfc4
@ -1595,13 +1595,13 @@ function htmlentities2($myHTML) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function wp_mail($to, $subject, $message, $headers = '', $more = '') {
|
function wp_mail($to, $subject, $message, $headers = '') {
|
||||||
if( $headers == '' ) {
|
if( $headers == '' ) {
|
||||||
$headers = "MIME-Version: 1.0\n" .
|
$headers = "MIME-Version: 1.0\n" .
|
||||||
"Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
|
"Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
return @mail($to, $subject, $message, $headers, $more);
|
return @mail($to, $subject, $message, $headers);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !function_exists('wp_login') ) :
|
if ( !function_exists('wp_login') ) :
|
||||||
|
Loading…
Reference in New Issue
Block a user