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

Make lost password admin notification pluggable. Fixes #7430 props error. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-07-29 20:21:34 +00:00
parent ec5a60f0cf
commit f69ddab179
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/pluggable.php
View File

@ -990,6 +990,24 @@ function wp_notify_moderator($comment_id) {
} }
endif; endif;
if ( !function_exists('wp_password_change_notification') ) :
/**
* Notify the blog admin of a user changing password, normally via email.
*
* @since 2.7
*
* @param object $user User Object
*/
function wp_password_change_notification(&$user) {
// send a copy of password change notification to the admin
// but check to see if it's the admin whose password we're changing, and skip this
if ( $user->user_email != get_option('admin_email') ) {
$message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
}
}
endif;
if ( !function_exists('wp_new_user_notification') ) : if ( !function_exists('wp_new_user_notification') ) :
/** /**
* Notify the blog admin of a new user, normally via email. * Notify the blog admin of a new user, normally via email.
@ -1562,4 +1580,4 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
} }
endif; endif;
?> ?>

9
wp-login.php
View File

@ -190,12 +190,7 @@ function reset_password($key) {
if ( !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message) ) if ( !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message) )
die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>'); die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
// send a copy of password change notification to the admin wp_password_change_notification($user);
// but check to see if it's the admin whose password we're changing, and skip this
if ( $user->user_email != get_option('admin_email') ) {
$message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
}
return true; return true;
} }
@ -508,4 +503,4 @@ try{document.getElementById('user_login').focus();}catch(e){}
break; break;
} // end action switch } // end action switch
?> ?>