Merge pull request #42 from wpdebruin/development

fix for BOX-63 and BOX-68

Author: lmajano

models/result/ValidationResult.cfc

@@ -162,8 +162,8 @@ component accessors="true" {
 		arguments.message = replacenocase( arguments.message, "{property}", arguments.error.getField(), "all");
 		// The validation type
 		arguments.message = replacenocase( arguments.message, "{validationType}", arguments.error.getValidationType(), "all");
-		// The validation data
-		if( arguments.error.getValidationType() neq 'UDF' ){
+		// The validation data, should be skipped if validationData is a struct
+		if( !listfindnocase( "UDF,RequiredUnless,RequiredIf,Unique", arguments.error.getValidationType() )){
 		 	arguments.message = replacenocase( arguments.message, "{validationData}", arguments.error.getValidationData(), "all");
 		}
 		// The target name of the object
@@ -291,4 +291,4 @@ component accessors="true" {
 		return this;
 	}
 
-}
+}