Merge branch 'hotfix-10.8.18' into stable

pixl8 · Jul 5, 2017 · 0837f93 · 0837f93
2 parents e7bc1b3 + 4d49c50
commit 0837f93
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/system/services/presideObjects/VersioningService.cfc b/system/services/presideObjects/VersioningService.cfc
@@ -251,16 +251,27 @@ component {
 					changedFields.append( field );
 				}
 			} else {
+
+				if ( !StructKeyExists( oldData, field ) ) {
+					continue;
+				}
+
 				var propDbType = ( properties[ field ].dbtype ?: "" );
-				if ( IsEmpty( arguments.newData[ field ] ?: "" ) ) {
-					if ( propDbType == "boolean" ) {
-						arguments.newData[ field ] = 0;
-					}
+
+				if ( propDbType == "boolean" && IsEmpty( arguments.newData[ field ] ?: "" ) ) {
+					arguments.newData[ field ] = 0;
 				}
-				if ( StructKeyExists( oldData, field ) && Compare( oldData[ field ], arguments.newData[ field ] ?: "" ) ) {
+
+				if ( ( propDbType == "datetime" || propDbType == "date" ) && isDate( arguments.newData[ field ] ?: "" ) ) {
+					if ( dateCompare( oldData[ field ], arguments.newData[ field ] ) ) {
+						changedFields.append( field );
+					}
+
+				} else if ( Compare( oldData[ field ], arguments.newData[ field ] ?: "" ) ) {
 					changedFields.append( field );
 				}
 			}
+
 		}
 
 		return changedFields;