Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

BUGFIX Fixed regression where Member::PasswordEncryption field wouldn…

…'t be set to the default
  • Loading branch information...
commit d28da56e19e9659c7636274c04871ed6fff7a52e 1 parent 033a1e5
Sean Harvey halkyon authored

Showing 2 changed files with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. +1 1  security/Member.php
  2. +1 1  tests/security/MemberTest.php
2  security/Member.php
@@ -659,7 +659,7 @@ function onBeforeWrite() {
659 659 $encryption_details = Security::encrypt_password(
660 660 $this->Password, // this is assumed to be cleartext
661 661 $this->Salt,
662   - $this->PasswordEncryption,
  662 + ($this->PasswordEncryption) ? $this->PasswordEncryption : Security::get_password_encryption_algorithm(),
663 663 $this
664 664 );
665 665
2  tests/security/MemberTest.php
@@ -627,4 +627,4 @@ function __construct() {
627 627 $this->characterStrength(3, array('lowercase','uppercase','digits','punctuation'));
628 628 }
629 629
630   -}
  630 +}

0 comments on commit d28da56

Please sign in to comment.
Something went wrong with that request. Please try again.