aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/files/cache/updater.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2016-04-20 15:22:22 +0200
committerRobin Appelman <icewind@owncloud.com>2016-04-21 13:18:24 +0200
commit5762a68c97a3c6e6571a570c2f63579cf09a890e (patch)
tree79900eb26b163b2c71364737a1717cea5ec5bcac /lib/private/files/cache/updater.php
parentb7867e93686985f0903abd40a0ec0544cd54ab6d (diff)
downloadnextcloud-server-5762a68c97a3c6e6571a570c2f63579cf09a890e.tar.gz
nextcloud-server-5762a68c97a3c6e6571a570c2f63579cf09a890e.zip
dont do optimized size propagation for encrypted files
Diffstat (limited to 'lib/private/files/cache/updater.php')
-rw-r--r--lib/private/files/cache/updater.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index 80ba704883e..3f80f2b6167 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -118,7 +118,10 @@ class Updater implements IUpdater {
}
$data = $this->scanner->scan($path, Scanner::SCAN_SHALLOW, -1, false);
- if (isset($data['oldSize']) && isset($data['size'])) {
+ if (
+ isset($data['oldSize']) && isset($data['size']) &&
+ !$data['encrypted'] // encryption is a pita and touches the cache itself
+ ) {
$sizeDifference = $data['size'] - $data['oldSize'];
} else {
// scanner didn't provide size info, fallback to full size calculation