tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 12:49:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4133 from nimeso/patch-1

Browse Source
This commit is contained in:
Daniel Hensby 2016-08-22 11:52:47 +01:00
commit 229a2b9217
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/Member.php
View File

@ -1378,7 +1378,12 @@ class Member extends DataObject implements TemplateGlobalProvider {
));
$mainFields->removeByName($self->config()->hidden_fields);
$mainFields->makeFieldReadonly('LastVisited');
// make sure that the "LastVisited" field exists
// it may have been removed using $self->config()->hidden_fields
if($mainFields->fieldByName("LastVisited")){
$mainFields->makeFieldReadonly('LastVisited');
}
if( ! $self->config()->lock_out_after_incorrect_logins) {
$mainFields->removeByName('FailedLoginCount');