Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5989 from woothemes/lost-password-email-username 

Lost password, lookup on username first before email.
This commit is contained in:
Mike Jolley 2014-08-12 12:41:35 +01:00
parent fea2cc55f7 4f011ae6a9
commit e4d0a6daef
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
includes/shortcodes/class-wc-shortcode-my-account.php
View File

@ -223,24 +223,18 @@ class WC_Shortcode_My_Account {
wc_add_notice( __( 'Enter a username or e-mail address.', 'woocommerce' ), 'error' );
} elseif ( strpos( $_POST['user_login'], '@' ) && apply_filters( 'woocommerce_get_username_from_email', true ) ) {
$user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
if ( empty( $user_data ) )
wc_add_notice( __( 'There is no user registered with that email address.', 'woocommerce' ), 'error' );
} else {
// Check on username first, as customers can use emails as usernames.
$login = trim( $_POST['user_login'] );
$user_data = get_user_by( 'login', $login );
}
do_action('lostpassword_post');
// If no user found, check if it login is emaill and lookup user based on email.
if ( ! $user_data && is_email( $_POST['user_login'] ) && apply_filters( 'woocommerce_get_username_from_email', true ) ) {
$user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
}
if( wc_notice_count( 'error' ) > 0 )
return false;
do_action('lostpassword_post');
if ( ! $user_data ) {
wc_add_notice( __( 'Invalid username or e-mail.', 'woocommerce' ), 'error' );
@ -251,7 +245,7 @@ class WC_Shortcode_My_Account {
$user_login = $user_data->user_login;
$user_email = $user_data->user_email;
do_action('retrieve_password', $user_login);
do_action( 'retrieve_password', $user_login );
$allow = apply_filters('allow_password_reset', true, $user_data->ID);