Merge pull request #22756 from owncloud/exclude-custom-data-dir
Exclude custom data directory from integrity checker
This commit is contained in:
commit
12479a1eda
|
@ -32,12 +32,18 @@ class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
|
||||||
$appFolders[$key] = rtrim($appFolder['path'], '/');
|
$appFolders[$key] = rtrim($appFolder['path'], '/');
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->excludedFolders = array_merge([
|
$excludedFolders = [
|
||||||
rtrim($root . '/data', '/'),
|
rtrim($root . '/data', '/'),
|
||||||
rtrim($root .'/themes', '/'),
|
rtrim($root .'/themes', '/'),
|
||||||
rtrim($root.'/config', '/'),
|
rtrim($root.'/config', '/'),
|
||||||
rtrim($root.'/apps', '/'),
|
rtrim($root.'/apps', '/'),
|
||||||
], $appFolders);
|
];
|
||||||
|
$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
|
||||||
|
if($customDataDir !== '') {
|
||||||
|
$excludedFolders[] = rtrim($customDataDir, '/');
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->excludedFolders = array_merge($excludedFolders, $appFolders);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue