summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2015-05-18 19:26:40 +0200
committerBjörn Schießle <bjoern@schiessle.org>2015-05-18 19:26:40 +0200
commit1c411baf17467f6d754c390317a775e685416aa1 (patch)
tree11df14d05f8615c9c8fe1728f9892c764f16218e /lib
parentb085f5855362bb8c305083c1d60ebfd459323a96 (diff)
parent1c500487ba33b5218929d08a6c95fd1096f7f9ce (diff)
downloadnextcloud-server-1c411baf17467f6d754c390317a775e685416aa1.tar.gz
nextcloud-server-1c411baf17467f6d754c390317a775e685416aa1.zip
Merge pull request #16412 from owncloud/jknockaert-patch-1
fix #16356
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/stream/encryption.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index e423868d82b..f2f5b9c9af7 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -341,8 +341,8 @@ class Encryption extends Wrapper {
} else {
$data = '';
}
+ $this->unencryptedSize = max($this->unencryptedSize, $this->position);
}
- $this->unencryptedSize = max($this->unencryptedSize, $this->position);
return $length;
}