summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-03-03 15:59:57 +0100
committerLukas Reschke <lukas@owncloud.com>2016-03-03 15:59:57 +0100
commita0df1bb0219f74539a771e710ff516399cee05f3 (patch)
treeabdb87780b0be5debf261736d9cf54403e2dcea3
parent4f25f341788b3edad1bf4baf739cd632785c9abb (diff)
parente55c52c07809d9bbcc386d4d473b4b1e9f49628c (diff)
downloadnextcloud-server-a0df1bb0219f74539a771e710ff516399cee05f3.tar.gz
nextcloud-server-a0df1bb0219f74539a771e710ff516399cee05f3.zip
Merge pull request #22813 from owncloud/exclude-assets-folder
Exclude the assets folder from integrity check
-rw-r--r--lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php
index fc261e4bc5a..766897e7517 100644
--- a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php
+++ b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php
@@ -35,8 +35,9 @@ class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
$excludedFolders = [
rtrim($root . '/data', '/'),
rtrim($root .'/themes', '/'),
- rtrim($root.'/config', '/'),
- rtrim($root.'/apps', '/'),
+ rtrim($root . '/config', '/'),
+ rtrim($root . '/apps', '/'),
+ rtrim($root . '/assets', '/'),
];
$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
if($customDataDir !== '') {