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 #5970 from open-sausages/pulls/4.0/fix-folder-validate

Browse Source 
BUG Fix issue with Folder::validate() failing on allowed_extensions
This commit is contained in:
Daniel Hensby 2016-09-08 11:44:31 +01:00 committed by GitHub
commit 1b6242ac64
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/File.php
View File

@ -997,7 +997,7 @@ class File extends DataObject implements ShortcodeHandler, AssetContainer, Thumb
} }
public function validate() { public function validate() {
$result = new ValidationResult(); $result = ValidationResult::create();
$this->File->validate($result, $this->Name); $this->File->validate($result, $this->Name);
$this->extend('validate', $result); $this->extend('validate', $result);
return $result; return $result;

7
Assets/Folder.php
View File

@ -9,6 +9,7 @@ use SilverStripe\Forms\HiddenField;
use SilverStripe\Forms\LiteralField; use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\TextField; use SilverStripe\Forms\TextField;
use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataList;
use SilverStripe\ORM\ValidationResult;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\ORM\Versioning\Versioned;
/** /**
@ -325,4 +326,10 @@ class Folder extends File {
public function StripThumbnail() { public function StripThumbnail() {
return null; return null;
} }
public function validate() {
$result = ValidationResult::create();
$this->extend('validate', $result);
return $result;
}
} }