diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2020-05-07 16:52:27 +0200 |
|---|---|---|
| committer | npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com> | 2020-05-07 17:44:56 +0000 |
| commit | 2be21fab9a449abddaf5013272a92b54e7dc6d40 (patch) | |
| tree | b5daf2be16ce9a6973f540e1c549b69f77a2bb64 /core/src/OC | |
| parent | d7305798092ba3c409ca330fbe526a096e2003bc (diff) | |
| download | nextcloud-server-2be21fab9a449abddaf5013272a92b54e7dc6d40.tar.gz nextcloud-server-2be21fab9a449abddaf5013272a92b54e7dc6d40.zip | |
Fix replacement dialog
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'core/src/OC')
| -rw-r--r-- | core/src/OC/dialogs.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index 37d8e0724f2..380aeb3a76b 100644 --- a/core/src/OC/dialogs.js +++ b/core/src/OC/dialogs.js @@ -787,11 +787,11 @@ const Dialogs = { $conflict.find('.filename').text(original.name) $originalDiv.find('.size').text(OC.Util.humanFileSize(original.size)) - $originalDiv.find('.mtime').text(formatDate(original.mtime)) + $originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime)) // ie sucks if (replacement.size && replacement.lastModifiedDate) { $replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size)) - $replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate)) + $replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModifiedDate)) } var path = original.directory + '/' + original.name var urlSpec = { |