Merge pull request #24492 from nextcloud/backport/24376/stable19

[stable19] fix loading mtime of new file in conflict dialog in firefox

Author: skjnldsv

core/js/dist/login.js

@@ -789,9 +789,9 @@ const Dialogs = {
 			$originalDiv.find('.size').text(OC.Util.humanFileSize(original.size))
 			$originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime))
 			// ie sucks
-			if (replacement.size && replacement.lastModifiedDate) {
+			if (replacement.size && replacement.lastModified) {
 				$replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size))
-				$replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModifiedDate))
+				$replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModified))
 			}
 			var path = original.directory + '/' + original.name
 			var urlSpec = {
@@ -822,9 +822,9 @@ const Dialogs = {
 
 			// set more recent mtime bold
 			// ie sucks
-			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) {
+			if (replacement.lastModified > original.mtime) {
 				$replacementDiv.find('.mtime').css('font-weight', 'bold')
-			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime) {
+			} else if (replacement.lastModified < original.mtime) {
 				$originalDiv.find('.mtime').css('font-weight', 'bold')
 			} else {
 				// TODO add to same mtime collection?