diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-15 02:03:27 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-15 02:03:27 +0400 |
| commit | 9fac95c2ab46a734607657bbad6f164aaa61286f (patch) | |
| tree | fc035f83bc812fd4b2f36427bb130ddabf71433e /lib/private/preview | |
| parent | b330d07b51a983dc563a91244a3c83e691c9e97d (diff) | |
| parent | df282d9ef8e040833574fac5c5fd3cbbae1b3209 (diff) | |
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/appconfig.php
Diffstat (limited to 'lib/private/preview')
| -rw-r--r-- | lib/private/preview/office.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/pdf.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/svg.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/unknown.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php index 7a4826c76ec..02bb22e9b94 100644 --- a/lib/private/preview/office.php +++ b/lib/private/preview/office.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ //both, libreoffice backend and php fallback, need imagick -if (extension_loaded('imagick')) { +if (extension_loaded('imagick') && count(@\Imagick::queryFormats("PDF")) === 1) { $isShellExecEnabled = \OC_Helper::is_function_enabled('shell_exec'); // LibreOffice preview is currently not supported on Windows diff --git a/lib/private/preview/pdf.php b/lib/private/preview/pdf.php index cc974b68818..d390b4fc677 100644 --- a/lib/private/preview/pdf.php +++ b/lib/private/preview/pdf.php @@ -7,7 +7,7 @@ */ namespace OC\Preview; -if (extension_loaded('imagick')) { +if (extension_loaded('imagick') && count(@\Imagick::queryFormats("PDF")) === 1) { class PDF extends Provider { diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php index b49e51720fa..9a73fff9467 100644 --- a/lib/private/preview/svg.php +++ b/lib/private/preview/svg.php @@ -7,7 +7,7 @@ */ namespace OC\Preview; -if (extension_loaded('imagick')) { +if (extension_loaded('imagick') && count(@\Imagick::queryFormats("SVG")) === 1) { class SVG extends Provider { diff --git a/lib/private/preview/unknown.php b/lib/private/preview/unknown.php index 4747f9e25ed..2d3b5c5655e 100644 --- a/lib/private/preview/unknown.php +++ b/lib/private/preview/unknown.php @@ -22,7 +22,7 @@ class Unknown extends Provider { $svgPath = substr_replace($path, 'svg', -3); - if (extension_loaded('imagick') && file_exists($svgPath)) { + if (extension_loaded('imagick') && file_exists($svgPath) && count(@\Imagick::queryFormats("SVG")) === 1) { // http://www.php.net/manual/de/imagick.setresolution.php#85284 $svg = new \Imagick(); |