Merge branch 'master' into display-share-owner-master

Conflicts:
	apps/files_sharing/lib/cache.php

1 files changed, 8 insertions, 2 deletions

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index fbac601f67a..f4546120702 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -734,6 +734,9 @@ Files.getMimeIcon = function(mime, ready) {
 		ready(Files.getMimeIcon.cache[mime]);
 	} else {
 		$.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path) {
+			if(SVGSupport()){
+				path = path.substr(0, path.length-4) + '.svg';
+			}
 			Files.getMimeIcon.cache[mime]=path;
 			ready(Files.getMimeIcon.cache[mime]);
 		});
@@ -783,13 +786,16 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
 		}
 		previewURL = previewURL.replace('(', '%28');
 		previewURL = previewURL.replace(')', '%29');
+		previewURL += '&forceIcon=0';
 
 		// preload image to prevent delay
 		// this will make the browser cache the image
 		var img = new Image();
 		img.onload = function(){
-			//set preview thumbnail URL
-			ready(previewURL);
+			// if loading the preview image failed (no preview for the mimetype) then img.width will < 5
+			if (img.width > 5) {
+				ready(previewURL);
+			}
 		}
 		img.src = previewURL;
 	});