tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 14:18:46 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #233 from halkyon/master

Browse Source 
Fixed regression where PasswordEncryption field not set on Member
This commit is contained in:
Sam Minnée 2012-03-08 20:49:21 -08:00
commit 9302137125
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/Member.php
View File

@ -659,7 +659,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
$encryption_details = Security::encrypt_password( $encryption_details = Security::encrypt_password(
$this->Password, // this is assumed to be cleartext $this->Password, // this is assumed to be cleartext
$this->Salt, $this->Salt,
$this->PasswordEncryption, ($this->PasswordEncryption) ? $this->PasswordEncryption : Security::get_password_encryption_algorithm(),
$this $this
); );

2
tests/security/MemberTest.php
View File

@ -627,4 +627,4 @@ class MemberTest_PasswordValidator extends PasswordValidator {
$this->characterStrength(3, array('lowercase','uppercase','digits','punctuation')); $this->characterStrength(3, array('lowercase','uppercase','digits','punctuation'));
} }
} }