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

Corrects merge errors.

Browse Source 
Closes #2937
This commit is contained in:
Simon Welsh 2014-03-11 07:03:20 +13:00
parent d431e98ecf
commit 18661005ee
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
forms/Form.php
View File

@ -1105,6 +1105,7 @@ class Form extends RequestHandler {
return $this->message;
}
}
/**
* Set a status message for the form.

7
security/Member.php
View File

@ -10,8 +10,6 @@
* @property string Email
* @property string Password
* @property string RememberLoginHash
* @property int NumVisit
* @property string LastVisited Date and time of last visit
* @property string AutoLoginHash
* @property string AutoLoginExpired
* @property string PasswordEncryption
@ -1215,11 +1213,6 @@ class Member extends DataObject implements TemplateGlobalProvider {
}
$mainFields->removeByName('Salt');
$mainFields->removeByName('NumVisit');
$mainFields->makeFieldReadonly('LastVisited');
$fields->removeByName('Subscriptions');
// Groups relation will get us into logical conflicts because
// Members are displayed within group edit form in SecurityAdmin