Permalink
Browse files

BUGFIX Fixed regression where Member::PasswordEncryption field wouldn…

…'t be set to the default
  • Loading branch information...
1 parent 033a1e5 commit d28da56e19e9659c7636274c04871ed6fff7a52e @halkyon halkyon committed Mar 9, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 security/Member.php
  2. +1 −1 tests/security/MemberTest.php
View
@@ -659,7 +659,7 @@ function onBeforeWrite() {
$encryption_details = Security::encrypt_password(
$this->Password, // this is assumed to be cleartext
$this->Salt,
- $this->PasswordEncryption,
+ ($this->PasswordEncryption) ? $this->PasswordEncryption : Security::get_password_encryption_algorithm(),
$this
);
@@ -627,4 +627,4 @@ function __construct() {
$this->characterStrength(3, array('lowercase','uppercase','digits','punctuation'));
}
-}
+}

0 comments on commit d28da56

Please sign in to comment.