This commit is contained in:
Mike Jolley 2014-09-12 14:18:11 +01:00
parent 64a4d2e32c
commit 59ef851302
2 changed files with 4 additions and 3 deletions

View File

@ -313,16 +313,16 @@ class WC_Shortcode_My_Account {
$user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE user_login = %s", $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 ) ) { if ( empty( $wp_hasher ) ) {
require_once ABSPATH . 'wp-includes/class-phpass.php'; require_once ABSPATH . 'wp-includes/class-phpass.php';
$wp_hasher = new PasswordHash( 8, true ); $wp_hasher = new PasswordHash( 8, true );
} }
$valid = $wp_hasher->CheckPassword($key, $user->user_activation_key); $valid = $wp_hasher->CheckPassword( $key, $user->user_activation_key );
} }
if ( empty( $user ) or ! isset($valid) or ! $valid ) { if ( empty( $user ) or empty( $valid ) ) {
wc_add_notice( __( 'Invalid key', 'woocommerce' ), 'error' ); wc_add_notice( __( 'Invalid key', 'woocommerce' ), 'error' );
return false; return false;
} }

View File

@ -136,6 +136,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Fix - Escaping of country names in tax settings. * Fix - Escaping of country names in tax settings.
* Fix - Encoding of pagination link when using default permalinks. * Fix - Encoding of pagination link when using default permalinks.
* Fix - NPR currency. * Fix - NPR currency.
* Fix - Fixing "Invalid key" error when clicking link in password reset email.
* Tweak - Display of locale information on system status page. * Tweak - Display of locale information on system status page.
* Tweak - Removed postcode for Bahamas. * Tweak - Removed postcode for Bahamas.
* Tweak - In system status, show path to template file override. * Tweak - In system status, show path to template file override.