WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't show email errors for people who don't have it. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2256 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2005-02-11 01:31:23 +00:00
parent 3a9560b6d6
commit 496b443095
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/install.php
View File

@ -163,8 +163,7 @@ $wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_nickname
$from = 'From: '.$_POST['weblog_title'].' <wordpress@'.$_SERVER['SERVER_NAME'].'>'; $from = 'From: '.$_POST['weblog_title'].' <wordpress@'.$_SERVER['SERVER_NAME'].'>';
$message_headers = "$from"; $message_headers = "$from";
$message = "Your new WordPress blog has been successfully set up at:
mail($admin_email, 'New WordPress Blog', "Your new WordPress blog has been successfully set up at:
$guessurl $guessurl
@ -177,7 +176,9 @@ We hope you enjoy your new weblog. Thanks!
--The WordPress Team --The WordPress Team
http://wordpress.org/ http://wordpress.org/
", $message_headers); ";
@mail($admin_email, 'New WordPress Blog', $message, $message_headers);
upgrade_all(); upgrade_all();
?> ?>

4
wp-includes/functions.php
View File

@ -1574,9 +1574,9 @@ function wp_mail($to, $subject, $message, $headers = '', $more = '') {
} }
if ( function_exists('mb_send_mail') ) 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 else
return mail($to, $subject, $message, $headers, $more); return @mail($to, $subject, $message, $headers, $more);
} }
if ( !function_exists('wp_login') ) : if ( !function_exists('wp_login') ) :