summaryrefslogtreecommitdiffstats
path: root/lib/private/preview/office.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/preview/office.php')
-rw-r--r--lib/private/preview/office.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 318ab51f851..884b6e7dc9b 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -6,8 +6,8 @@
* See the COPYING-README file.
*/
//both, libreoffice backend and php fallback, need imagick
-if (extension_loaded('imagick')) {
- $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
+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
if (!\OC_Util::runningOnWindows()) {