reuse existing helper function OC_Helper::is_function_enabled

diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index ac771deb413f5aef9f4aa07f33d2d92e0f009cfe..71cd3bae0573d299ffc9806be234d76b0ec5a4bd 100644 (file)
--- 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 318ab51f851df4528bdc8aa5a17a95a21adce11b..7a4826c76ecbdb535ff22bce60770aac662bef64 100644 (file)
--- 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()) {