Skip to content
Permalink
Browse files

PRESIDECMS-1759 Revert "PRESIDECMS-1753 Validation fails with fieldNa…

…me prefix/suffix"

This reverts commit 4a6cd5c.
  • Loading branch information
DominicWatson committed Dec 2, 2019
1 parent 461e95f commit 48c7d6c3afda7005aa9b92ce28f00010d5e64d81
Showing with 3 additions and 3 deletions.
  1. +3 −3 system/services/validation/ValidationEngine.cfc
@@ -56,13 +56,13 @@ component displayName="Validation Engine" {
if ( ( arguments.ignoreMissing && !StructKeyExists( arguments.data, rule.fieldName ) ) || ( arrayLen( arguments.suppressFields ) && arrayFind( arguments.suppressFields, rule.fieldName ) ) ) {
continue;
}
if ( !result.fieldHasError( expandedFieldName ) && _evaluateConditionalRule( rule, data ) ) {
if ( !result.fieldHasError( rule.fieldName ) && _evaluateConditionalRule( rule, data ) ) {
provider = validators[ rule.validator ];

fieldResult = provider.runValidator(
name = rule.validator
, fieldName = expandedFieldName
, value = arguments.data[ expandedFieldName ] ?: ""
, fieldName = rule.fieldName
, value = arguments.data[ expandedFieldName ] ?: ( arguments.data[ rule.fieldName ] ?: "" )
, params = rule.params
, data = arguments.data
);

0 comments on commit 48c7d6c

Please sign in to comment.
You can’t perform that action at this time.