Merge branch 'hotfix-10.8.21' into stable

pixl8 · Jul 7, 2017 · 54662b9 · 54662b9
2 parents 4744343 + 9216f5f
commit 54662b9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/system/services/presideObjects/VersioningService.cfc b/system/services/presideObjects/VersioningService.cfc
@@ -209,7 +209,7 @@ component {
 					, values           = manyToManyData[ propertyName ]
 					, versionNumber    = arguments.versionNumber
 					, versionAuthor    = arguments.versionAuthor
-				);				
+				);
 			}
 		}
 
@@ -262,11 +262,10 @@ component {
 					arguments.newData[ field ] = 0;
 				}
 
-				if ( ( propDbType == "datetime" || propDbType == "date" ) && isDate( arguments.newData[ field ] ?: "" ) ) {
+				if ( ( propDbType == "datetime" || propDbType == "date" ) && isDate( arguments.newData[ field ] ?: "" ) && isDate( oldData[ field ] ) ) {
 					if ( dateCompare( oldData[ field ], arguments.newData[ field ] ) ) {
 						changedFields.append( field );
 					}
-
 				} else if ( Compare( oldData[ field ], arguments.newData[ field ] ?: "" ) ) {
 					changedFields.append( field );
 				}
@@ -688,7 +687,7 @@ component {
 		var targetObject  = prop.relatedTo       ?: "";
 		var targetIdField = poService.getIdField( targetObject );
 		var newDataItems  = len( newData ) ? deserializeJSON( "[ #newData# ]" ) : [];
-		
+
 		var existingRecords  = poService.selectData(
 			  objectName       = targetObject
 			, filter           = { "#targetFk#"=arguments.sourceId }