summaryrefslogtreecommitdiffstats
path: root/lib/private/files/stream
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-03-30 13:36:56 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:28 +0200
commit4441835d189d037a021ba9a11fd96cf55ba2db3f (patch)
treebe55362cd2100abe8cd6ae6ac5b3b674f4fe4a36 /lib/private/files/stream
parent90487384f77d916ab2dbe495b46bdf5182fb875a (diff)
downloadnextcloud-server-4441835d189d037a021ba9a11fd96cf55ba2db3f.tar.gz
nextcloud-server-4441835d189d037a021ba9a11fd96cf55ba2db3f.zip
https://github.com/owncloud/core/pull/15305#discussion_r27382305
Conflicts: lib/private/files/stream/encryption.php
Diffstat (limited to 'lib/private/files/stream')
-rw-r--r--lib/private/files/stream/encryption.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 62b2ad9d9af..3e8c3a912da 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -205,6 +205,8 @@ class Encryption extends Wrapper {
$this->loadContext('ocencryption');
$this->position = 0;
+ $this->cache = '';
+ $this->writeFlag = false;
$this->unencryptedBlockSize = $this->encryptionModule->getUnencryptedBlockSize();
if (