diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-08 15:55:17 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-07-08 15:55:17 +0200 |
| commit | c2d88a08b796ca19c8b5ec63bfd34ac32ead4208 (patch) | |
| tree | f18e0ba4d05361456a6712378ccc0784620c1e9c /lib/private/PreviewManager.php | |
| parent | 48f9e4ed03f3148d62919a95496ee43164d3e707 (diff) | |
| download | nextcloud-server-c2d88a08b796ca19c8b5ec63bfd34ac32ead4208.tar.gz nextcloud-server-c2d88a08b796ca19c8b5ec63bfd34ac32ead4208.zip | |
Remove unneeded checks if it runs on a Windows machine
* the setup check is still there
Diffstat (limited to 'lib/private/PreviewManager.php')
| -rw-r--r-- | lib/private/PreviewManager.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index f3c7a4de0d0..43c414ccb63 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -299,8 +299,7 @@ class PreviewManager implements IPreview { } if (count($checkImagick->queryFormats('PDF')) === 1) { - // Office previews are currently not supported on Windows - if (!\OC_Util::runningOnWindows() && \OC_Helper::is_function_enabled('shell_exec')) { + if (\OC_Helper::is_function_enabled('shell_exec')) { $officeFound = is_string($this->config->getSystemValue('preview_libreoffice_path', null)); if (!$officeFound) { @@ -324,9 +323,8 @@ class PreviewManager implements IPreview { } } - // Video requires avconv or ffmpeg and is therefor - // currently not supported on Windows. - if (in_array('OC\Preview\Movie', $this->getEnabledDefaultProvider()) && !\OC_Util::runningOnWindows()) { + // Video requires avconv or ffmpeg + if (in_array('OC\Preview\Movie', $this->getEnabledDefaultProvider())) { $avconvBinary = \OC_Helper::findBinaryPath('avconv'); $ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg'); |