summaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-01-05 04:32:30 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2014-01-05 04:32:30 -0800
commite2d739fa21817c8442304e69a3fd70454def0aa7 (patch)
tree213575004e76ec564074a5a63ddf45e29bdb3036 /apps/files_external
parente4616199df5ca6b5ba490455a505d36dc954f0f6 (diff)
parentf52a9e5e4249b7e5bc50ec21105e520bd815bb7d (diff)
downloadnextcloud-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-xapps/files_external/lib/config.php2
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;