diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-11-24 01:12:43 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-11-24 01:12:43 +0100 |
| commit | cebfdd877d49208f2a89e6661a019eb592617e92 (patch) | |
| tree | d4a5e5b13607ef7aaa11f4216845a2dfa1a3de5d | |
| parent | a3496cf7fab6f4e9d4ce804e3b3ce0fc83a863dc (diff) | |
| parent | 45d985f2d8f3df26960b36e7cb6d75513e5e7dfc (diff) | |
| download | nextcloud-server-cebfdd877d49208f2a89e6661a019eb592617e92.tar.gz nextcloud-server-cebfdd877d49208f2a89e6661a019eb592617e92.zip | |
Merge pull request #12372 from owncloud/preview_tiff_fix
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
| -rw-r--r-- | lib/private/preview.php | 10 | ||||
| -rw-r--r-- | lib/private/preview/image.php | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/lib/private/preview.php b/lib/private/preview.php index f50bdcb4c9e..778007b21fd 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -892,16 +892,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 ec5b87befea..7bcbddc649e 100644 --- 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) { |