diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-03-06 11:55:45 +0100 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-03-06 11:55:45 +0100 |
| commit | eb5265b1065c4978028c34ee7b77aff137c51c9f (patch) | |
| tree | 8448dbbf0eecb87746cfc23ee8ecd1389295fa89 /lib/private/preview/office.php | |
| parent | dbf83aada2f8dae509d17b947ecce6a4d09f8174 (diff) | |
| parent | 1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a (diff) | |
| download | nextcloud-server-eb5265b1065c4978028c34ee7b77aff137c51c9f.tar.gz nextcloud-server-eb5265b1065c4978028c34ee7b77aff137c51c9f.zip | |
fix merge conflicts
Diffstat (limited to 'lib/private/preview/office.php')
| -rw-r--r-- | lib/private/preview/office.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php index 269e1dad74e..882c4426e6d 100644 --- a/lib/private/preview/office.php +++ b/lib/private/preview/office.php @@ -15,9 +15,9 @@ if (extension_loaded('imagick')) { // LibreOffice preview is currently not supported on Windows if (!\OC_Util::runningOnWindows()) { - $whichLibreOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : ''); + $whichLibreOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : ''); $isLibreOfficeAvailable = !empty($whichLibreOffice); - $whichOpenOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : ''); + $whichOpenOffice = ($isShellExecEnabled ? shell_exec('command -v 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)))) { |