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-08 10:45:37 +0100 |
| commit | 7e367636319c11bff696499712c91ba8bc251184 (patch) | |
| tree | 37c43b9c93a94051574c4a8dd75051d33bdbb9f5 /lib | |
| parent | 542cf79595c9905e93aeb927daab938b4fe15d1e (diff) | |
| download | nextcloud-server-7e367636319c11bff696499712c91ba8bc251184.tar.gz nextcloud-server-7e367636319c11bff696499712c91ba8bc251184.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()) { |