summaryrefslogtreecommitdiffstats
path: root/settings/admin.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-19 17:04:55 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-19 17:04:55 +0100
commite32968cfcea295f21336c1cda0bbe8d7a107b1eb (patch)
tree79c51b187cff4c18dc0bab185f83f4b73795f6e3 /settings/admin.php
parent284ba5b688d7f0a9d2e1f7b9a68a7e8362be5e67 (diff)
downloadnextcloud-server-e32968cfcea295f21336c1cda0bbe8d7a107b1eb.tar.gz
nextcloud-server-e32968cfcea295f21336c1cda0bbe8d7a107b1eb.zip
Remove exec() call with invalid name on windows
Currently running unit tests prints the following message 3 times: The command "command" is misspelt or could not be found. Instead of trying this, we just skip this now.
Diffstat (limited to 'settings/admin.php')
-rw-r--r--settings/admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php
index d1ed6e75f50..2b964613096 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -123,7 +123,7 @@ $template->printPage();
* @return null|string
*/
function findBinaryPath($program) {
- if (OC_Helper::is_function_enabled('exec')) {
+ if (!\OC_Util::runningOnWindows() && \OC_Helper::is_function_enabled('exec')) {
exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
if ($returnCode === 0 && count($output) > 0) {
return escapeshellcmd($output[0]);