diff options
author | Georg Ehrke <georg@ownCloud.com> | 2013-06-05 10:50:20 +0200 |
---|---|---|
committer | Georg Ehrke <georg@ownCloud.com> | 2013-06-05 10:50:20 +0200 |
commit | bcc4fca25740894249f1b1e8bf254beeadd3e74f (patch) | |
tree | 03a7a72e3aeffd262d880a94dd66e98a2a3e4f12 /lib/preview/office.php | |
parent | 34decf357697a81c23e844ef606c04a20a08c597 (diff) | |
download | nextcloud-server-bcc4fca25740894249f1b1e8bf254beeadd3e74f.tar.gz nextcloud-server-bcc4fca25740894249f1b1e8bf254beeadd3e74f.zip |
save current work state of libreoffice preview backend
Diffstat (limited to 'lib/preview/office.php')
-rw-r--r-- | lib/preview/office.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/preview/office.php b/lib/preview/office.php index c66f5584f07..cc1addf3996 100644 --- a/lib/preview/office.php +++ b/lib/preview/office.php @@ -5,9 +5,11 @@ * later. * See the COPYING-README file. */ -if(shell_exec('libreoffice') || shell_exec('openoffice')) { +//let's see if there is libreoffice or openoffice on this machine +if(shell_exec('libreoffice --headless --version') || shell_exec('openoffice --headless --version') || is_string(\OC_Config::getValue('preview_libreoffice_path', null))) { require_once('libreoffice-cl.php'); }else{ + //in case there isn't, use our fallback require_once('msoffice.php'); require_once('opendocument.php'); }
\ No newline at end of file |