Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2022-09-20 16:00:12 +0300
committerGitHub <noreply@github.com>2022-09-20 16:00:12 +0300
commit132012c075785f2d6dc5bd73845b69f547ebe5be (patch)
tree8e94161bca9ca32ae70f1a7e9e4759c4670a01a3
parent20ee356a29868e945c8e2c1537319ef0de12ee30 (diff)
parentefedb218e3c95815fef33db1dbf96aab0a0cccc1 (diff)
Merge pull request #34161 from nextcloud/bugfix/noid/fix-ffmpeg-preview-manager
Fix FFMPEG preview manager
-rw-r--r--lib/private/PreviewManager.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php
index e78bdefda8d..a2d34892c68 100644
--- a/lib/private/PreviewManager.php
+++ b/lib/private/PreviewManager.php
@@ -385,10 +385,10 @@ class PreviewManager implements IPreview {
if (count($checkImagick->queryFormats('PDF')) === 1) {
// Office requires openoffice or libreoffice
$officeBinary = $this->config->getSystemValue('preview_libreoffice_path', null);
- if (is_null($officeBinary)) {
+ if (!is_string($officeBinary)) {
$officeBinary = $this->binaryFinder->findBinaryPath('libreoffice');
}
- if (is_null($officeBinary)) {
+ if (!is_string($officeBinary)) {
$officeBinary = $this->binaryFinder->findBinaryPath('openoffice');
}
@@ -405,7 +405,7 @@ class PreviewManager implements IPreview {
// Video requires avconv or ffmpeg
if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) {
$movieBinary = $this->binaryFinder->findBinaryPath('avconv');
- if (is_null($movieBinary)) {
+ if (!is_string($movieBinary)) {
$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
}