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.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 673b16edc19..318ab51f851 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -9,11 +9,11 @@
if (extension_loaded('imagick')) {
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
- // movie preview is currently not supported on Windows
+ // LibreOffice preview is currently not supported on Windows
if (!\OC_Util::runningOnWindows()) {
- $whichLibreOffice = shell_exec('which libreoffice');
+ $whichLibreOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
$isLibreOfficeAvailable = !empty($whichLibreOffice);
- $whichOpenOffice = shell_exec('which libreoffice');
+ $whichOpenOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
$isOpenOfficeAvailable = !empty($whichOpenOffice);
//let's see if there is libreoffice or openoffice on this machine
if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {