diff options
| author | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-01 15:32:27 -0500 |
|---|---|---|
| committer | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-01 15:32:27 -0500 |
| commit | 12479a1eda63e45207290eeaa68498112c40a9bf (patch) | |
| tree | a43ada284aa06e8e22a6ac5f2c998d3c2fc5d2f7 /lib | |
| parent | 069c65479d9ad0587415757c5bab200b6f00127e (diff) | |
| parent | c51a01b43f514fc50c47de1ed78d2bdfb8572621 (diff) | |
| download | nextcloud-server-12479a1eda63e45207290eeaa68498112c40a9bf.tar.gz nextcloud-server-12479a1eda63e45207290eeaa68498112c40a9bf.zip | |
Merge pull request #22756 from owncloud/exclude-custom-data-dir
Exclude custom data directory from integrity checker
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php index 67bcd423b68..fc261e4bc5a 100644 --- a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php +++ b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php @@ -32,12 +32,18 @@ class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator { $appFolders[$key] = rtrim($appFolder['path'], '/'); } - $this->excludedFolders = array_merge([ + $excludedFolders = [ rtrim($root . '/data', '/'), rtrim($root .'/themes', '/'), rtrim($root.'/config', '/'), rtrim($root.'/apps', '/'), - ], $appFolders); + ]; + $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', ''); + if($customDataDir !== '') { + $excludedFolders[] = rtrim($customDataDir, '/'); + } + + $this->excludedFolders = array_merge($excludedFolders, $appFolders); } /** |