diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-05 04:32:30 -0800 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-05 04:32:30 -0800 |
commit | e2d739fa21817c8442304e69a3fd70454def0aa7 (patch) | |
tree | 213575004e76ec564074a5a63ddf45e29bdb3036 /apps/files_external | |
parent | e4616199df5ca6b5ba490455a505d36dc954f0f6 (diff) | |
parent | f52a9e5e4249b7e5bc50ec21105e520bd815bb7d (diff) | |
download | nextcloud-server-e2d739fa21817c8442304e69a3fd70454def0aa7.tar.gz nextcloud-server-e2d739fa21817c8442304e69a3fd70454def0aa7.zip |
Merge pull request #6580 from monreal/master
Silence output of 'which' command used in smbclient detection
Diffstat (limited to 'apps/files_external')
-rwxr-xr-x | apps/files_external/lib/config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 12836c7b88c..122cc57debc 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -431,7 +431,7 @@ class OC_Mount_Config { */ public static function checksmbclient() { if(function_exists('shell_exec')) { - $output=shell_exec('which smbclient'); + $output=shell_exec('which smbclient 2> /dev/null'); return !empty($output); }else{ return false; |