diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-07 14:52:18 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-07 14:52:18 +0100 |
| commit | 07a84aa5ebc71c1476f89eb5736754b7a2f74d47 (patch) | |
| tree | 748f9d6ceca23959cff91c7ab0016a2ba5ec3dc7 /lib | |
| parent | 970eed2867913f97f503e32adbed0bd3ace4ad97 (diff) | |
| download | nextcloud-server-07a84aa5ebc71c1476f89eb5736754b7a2f74d47.tar.gz nextcloud-server-07a84aa5ebc71c1476f89eb5736754b7a2f74d47.zip | |
reuse existing helper function OC_Helper::is_function_enabled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/preview/movies.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/office.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php index ac771deb413..71cd3bae057 100644 --- a/lib/private/preview/movies.php +++ b/lib/private/preview/movies.php @@ -18,7 +18,7 @@ function findBinaryPath($program) { // movie preview is currently not supported on Windows if (!\OC_Util::runningOnWindows()) { - $isExecEnabled = !in_array('exec', explode(', ', ini_get('disable_functions'))); + $isExecEnabled = \OC_Helper::is_function_enabled('exec'); $ffmpegBinary = null; $avconvBinary = null; diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php index 318ab51f851..7a4826c76ec 100644 --- a/lib/private/preview/office.php +++ b/lib/private/preview/office.php @@ -7,7 +7,7 @@ */ //both, libreoffice backend and php fallback, need imagick if (extension_loaded('imagick')) { - $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions'))); + $isShellExecEnabled = \OC_Helper::is_function_enabled('shell_exec'); // LibreOffice preview is currently not supported on Windows if (!\OC_Util::runningOnWindows()) { |