Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2015-08-09 19:18:06 +0300
committermattab <matthieu.aubry@gmail.com>2015-08-09 19:41:15 +0300
commitc95756a4fa104d24015fa49bffd03050b4e11ff6 (patch)
tree1264dc27da5bf530a444f2abe5182f157fd30f20 /core/Filesystem.php
parent40f9cc058181fb86ab97eb9aaad2d0322b57b883 (diff)
since shell_exec does not return command output code, working around by looking at the output itself
Fixes #8525
Diffstat (limited to 'core/Filesystem.php')
-rw-r--r--core/Filesystem.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/Filesystem.php b/core/Filesystem.php
index d50c2d8e28..73a07a54bb 100644
--- a/core/Filesystem.php
+++ b/core/Filesystem.php
@@ -136,9 +136,11 @@ class Filesystem
$output = @shell_exec($command);
if ($output) {
$output = explode("\n", $output);
- if (count($output) > 1) {
- // check if filesystem is NFS
+ $commandFailed = (false !== strpos($output, "no file systems processed"));
+ if (!$commandFailed
+ && count($output) > 1) {
+ // check if filesystem is NFS
return true;
}
}