mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12372 from owncloud/preview_tiff_fix 

remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
This commit is contained in:
Lukas Reschke 2014-11-24 01:12:43 +01:00
parent a3496cf7fa 45d985f2d8
commit cebfdd877d
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/preview.php
View File

@ -892,16 +892,6 @@ class Preview {
self::initProviders(); 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) { foreach(self::$providers as $supportedMimetype => $provider) {
if(preg_match($supportedMimetype, $mimeType)) { if(preg_match($supportedMimetype, $mimeType)) {
return true; return true;

2
lib/private/preview/image.php
View File

@ -11,7 +11,7 @@ namespace OC\Preview;
class Image extends Provider { class Image extends Provider {
public function getMimeType() { public function getMimeType() {
return '/image\/.*/'; return '/image\/(?!tiff$)(?!svg.*).*/';
} }
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {