tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9887 from lekoala/patch-18

This commit is contained in:
Garion Herman 2021-04-24 21:05:29 +12:00 committed by GitHub
parent c18a5f92a2 fc40e0b98a
commit debf1ae9fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Security/Member.php
View File

@ -871,6 +871,11 @@ class Member extends DataObject
*/
public function onBeforeWrite()
{
// Remove any line-break or space characters accidentally added during a copy-paste operation
if ($this->Email) {
$this->Email = trim($this->Email);
}
// If a member with the same "unique identifier" already exists with a different ID, don't allow merging.
// Note: This does not a full replacement for safeguards in the controller layer (e.g. in a registration form),
// but rather a last line of defense against data inconsistencies.

8
tests/php/Security/MemberTest.php
View File

@ -1593,4 +1593,12 @@ class MemberTest extends FunctionalTest
$this->assertSame('Johnson', $member->getLastName(), 'getLastName should proxy to Surname');
}
public function testEmailIsTrimmed()
{
$member = new Member();
$member->Email = " trimmed@test.com\r\n";
$member->write();
$this->assertNotNull(Member::get()->find('Email', 'trimmed@test.com'));
}
}