From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Fri, 20 Sep 2013 12:29:45 +0000 (+0200)
Subject: use correct property for mimetype of existing files
X-Git-Tag: v6.0.0alpha2~71^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5a174eba8304680db8604592089804ab64e77258;p=nextcloud-server.git

use correct property for mimetype of existing files
---

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index ac37b109e76..e5e9f6dbb7d 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -294,7 +294,7 @@ var OCdialogs = {
 				conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
 			}
 			var path = getPathForPreview(original.name);
-			lazyLoadPreview(path, original.type, function(previewpath){
+			lazyLoadPreview(path, original.mime, function(previewpath){
 				conflict.find('.original .icon').css('background-image','url('+previewpath+')');
 			}, 96, 96);
 			getCroppedPreview(replacement).then(