mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX: Fixed validation to accept arrays (FileField case)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108792 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
8b8df80ccb
commit
9d305bc94a
@ -100,7 +100,10 @@ JS;
|
|||||||
if($this->required) {
|
if($this->required) {
|
||||||
foreach($this->required as $fieldName) {
|
foreach($this->required as $fieldName) {
|
||||||
$formField = $fields->dataFieldByName($fieldName);
|
$formField = $fields->dataFieldByName($fieldName);
|
||||||
if($formField && !strlen($data[$fieldName])) {
|
|
||||||
|
// we need to check if $data[$fieldName] is an array (FileFiled case)
|
||||||
|
if(($formField && $data[$fieldName] == "") ||
|
||||||
|
(is_array($data[$fieldName]) && $data[$fieldName]['name'] == "")) {
|
||||||
$errorMessage = sprintf(_t('Form.FIELDISREQUIRED', '%s is required').'.', strip_tags('"' . ($formField->Title() ? $formField->Title() : $fieldName) . '"'));
|
$errorMessage = sprintf(_t('Form.FIELDISREQUIRED', '%s is required').'.', strip_tags('"' . ($formField->Title() ? $formField->Title() : $fieldName) . '"'));
|
||||||
if($msg = $formField->getCustomValidationMessage()) {
|
if($msg = $formField->getCustomValidationMessage()) {
|
||||||
$errorMessage = $msg;
|
$errorMessage = $msg;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user