Skip to content

Commit 7e68c66

Browse files
committed
Merge branch 'development'
2 parents fcccd25 + 73d3d53 commit 7e68c66

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"ColdBox Validation",
33
"author":"Ortus Solutions <[email protected]>",
4-
"version":"3.1.0",
4+
"version":"3.1.1",
55
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbvalidation/@build.version@/[email protected]@.zip",
66
"slug":"cbvalidation",
77
"type":"modules",

changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
----
9+
10+
## [3.1.0] => 2021-MAY-17
11+
12+
### Fixed
13+
14+
* Regression when doing global replacements for `validationData`. It was changed to a `!isStruct()` but in reality, it has to be simple ONLY for replacements.
815

916
----
1017

models/result/ValidationResult.cfc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,8 @@ component accessors="true" {
193193
arguments.error.getValidationType(),
194194
"all"
195195
);
196-
// The validation data, should be skipped if validationData is a struct
197-
// Only possible because error.getvaldationData is returning any now
198-
if ( !isStruct( arguments.error.getValidationData() ) ) {
196+
// Validation data that is SIMPLE ONLY!
197+
if ( isSimpleValue( arguments.error.getValidationData() ) ) {
199198
arguments.message = replaceNoCase(
200199
arguments.message,
201200
"{validationData}",

0 commit comments

Comments
 (0)