mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22756 from owncloud/exclude-custom-data-dir 

Exclude custom data directory from integrity checker
This commit is contained in:
C. Montero Luque 2016-03-01 15:32:27 -05:00
parent 069c65479d c51a01b43f
commit 12479a1eda
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php
View File

@ -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);
}
/**