check if imagick is loaded in office.php, not in libreoffice-cl.php
This commit is contained in:
parent
2ff97917e9
commit
28cf63d37d
|
@ -8,9 +8,7 @@
|
||||||
namespace OC\Preview;
|
namespace OC\Preview;
|
||||||
|
|
||||||
//we need imagick to convert
|
//we need imagick to convert
|
||||||
if (extension_loaded('imagick')) {
|
class Office extends Provider {
|
||||||
|
|
||||||
class Office extends Provider {
|
|
||||||
|
|
||||||
private $cmd;
|
private $cmd;
|
||||||
|
|
||||||
|
@ -47,9 +45,7 @@ if (extension_loaded('imagick')) {
|
||||||
unlink($abspath);
|
unlink($abspath);
|
||||||
unlink($abspath . '.pdf');
|
unlink($abspath . '.pdf');
|
||||||
|
|
||||||
if (!$image->valid()) return false;
|
return $image->valid() ? $image : false;
|
||||||
|
|
||||||
return $image;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function initCmd() {
|
private function initCmd() {
|
||||||
|
@ -73,7 +69,6 @@ if (extension_loaded('imagick')) {
|
||||||
|
|
||||||
$this->cmd = $cmd;
|
$this->cmd = $cmd;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//.doc, .dot
|
//.doc, .dot
|
||||||
|
|
|
@ -5,11 +5,14 @@
|
||||||
* later.
|
* later.
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
//let's see if there is libreoffice or openoffice on this machine
|
//both, libreoffice backend and php fallback, need imagick
|
||||||
if(shell_exec('libreoffice --headless --version') || shell_exec('openoffice --headless --version') || is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
|
if (extension_loaded('imagick')) {
|
||||||
|
//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');
|
require_once('libreoffice-cl.php');
|
||||||
}else{
|
}else{
|
||||||
//in case there isn't, use our fallback
|
//in case there isn't, use our fallback
|
||||||
require_once('msoffice.php');
|
require_once('msoffice.php');
|
||||||
require_once('opendocument.php');
|
require_once('opendocument.php');
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue