Conflicts:
	lib/private/files/stream/encryption.php
This commit is contained in:
Thomas Müller 2015-03-30 13:36:56 +02:00
parent 90487384f7
commit 4441835d18
1 changed files with 2 additions and 0 deletions

View File

@ -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 (