BUGFIX Fixed regression where Member::PasswordEncryption field wouldn…

…'t be set to the default
ajshort · Mar 9, 2012 · d28da56 · d28da56
1 parent 033a1e5
commit d28da56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/security/Member.php b/security/Member.php
@@ -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
 			);
 

diff --git a/tests/security/MemberTest.php b/tests/security/MemberTest.php
@@ -627,4 +627,4 @@ function __construct() {
 		$this->characterStrength(3, array('lowercase','uppercase','digits','punctuation'));
 	}
 
-}
+}