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

Merge pull request #2112 from willmorgan/master

Browse Source 
MINOR Using Injector pattern for ValidationResult in Member
This commit is contained in:
Ingo Schommer 2013-06-18 09:36:11 -07:00
commit d95f8a87ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/Member.php
View File

@ -230,7 +230,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
* @return ValidationResult * @return ValidationResult
*/ */
public function canLogIn() { public function canLogIn() {
$result = new ValidationResult(); $result = ValidationResult::create();
if($this->isLockedOut()) { if($this->isLockedOut()) {
$result->error(_t ( $result->error(_t (
@ -677,7 +677,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
) )
); );
if($existingRecord) { if($existingRecord) {
throw new ValidationException(new ValidationResult(false, _t( throw new ValidationException(ValidationResult::create(false, _t(
'Member.ValidationIdentifierFailed', 'Member.ValidationIdentifierFailed',
'Can\'t overwrite existing member #{id} with identical identifier ({name} = {value}))', 'Can\'t overwrite existing member #{id} with identical identifier ({name} = {value}))',
'Values in brackets show "fieldname = value", usually denoting an existing email address', 'Values in brackets show "fieldname = value", usually denoting an existing email address',