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 #6243 from chrisnharvey/patch-2 

Fixing "Invalid key" error when clicking link in password reset email
This commit is contained in:
Mike Jolley 2014-09-12 14:11:02 +01:00
parent 066eb3c5b0 4d72eedae2
commit 64a4d2e32c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,7 @@ class WC_Shortcode_My_Account {
* @return object|bool User's database row on success, false for invalid keys
*/
public static function check_password_reset_key( $key, $login ) {
global $wpdb;
global $wpdb, $wp_hasher;
$key = preg_replace( '/[^a-z0-9]/i', '', $key );
@ -311,9 +311,18 @@ class WC_Shortcode_My_Account {
return false;
}
$user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login ) );
$user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE user_login = %s", $login ) );
if ( empty( $user ) ) {
if ( ! empty($user)) {
if ( empty( $wp_hasher ) ) {
require_once ABSPATH . 'wp-includes/class-phpass.php';
$wp_hasher = new PasswordHash( 8, true );
}
$valid = $wp_hasher->CheckPassword($key, $user->user_activation_key);
}
if ( empty( $user ) or ! isset($valid) or ! $valid ) {
wc_add_notice( __( 'Invalid key', 'woocommerce' ), 'error' );
return false;
}