remove ugly hack and don't use OC\Preview\Image for tiffs and svgs

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 907bef923b5f63d16d237dec61020b34991e5342..a0f2e81528f9b9bec3377521becc9a9df7090e55 100644 (file)
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -855,16 +855,6 @@ class Preview {
                        self::initProviders();
                }
 
-               // FIXME: Ugly hack to prevent SVG of being returned if the SVG
-               // provider is not enabled.
-               // This is required because the preview system is designed in a
-               // bad way and relies on opt-in with asterisks (i.e. image/*)
-               // which will lead to the fact that a SVG will also match the image
-               // provider.
-               if($mimeType === 'image/svg+xml' && !array_key_exists('/image\/svg\+xml/', self::$providers)) {
-                       return false;
-               }
-
                foreach(self::$providers as $supportedMimetype => $provider) {
                        if(preg_match($supportedMimetype, $mimeType)) {
                                return true;

diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index cec5d7c0170182d17cf15e1c95ac75f4f8b96420..c5f566aa946b98cee19b13bdf10f4827511e5b2b 100644 (file)
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -11,7 +11,7 @@ namespace OC\Preview;
 class Image extends Provider {
 
        public function getMimeType() {
-               return '/image\/.*/';
+               return '/image\/(?!tiff$)(?!svg.*).*/';
        }
 
        public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {