Conflicts: lib/private/files/stream/encryption.php
This commit is contained in:
parent
90487384f7
commit
4441835d18
|
@ -205,6 +205,8 @@ class Encryption extends Wrapper {
|
||||||
$this->loadContext('ocencryption');
|
$this->loadContext('ocencryption');
|
||||||
|
|
||||||
$this->position = 0;
|
$this->position = 0;
|
||||||
|
$this->cache = '';
|
||||||
|
$this->writeFlag = false;
|
||||||
$this->unencryptedBlockSize = $this->encryptionModule->getUnencryptedBlockSize();
|
$this->unencryptedBlockSize = $this->encryptionModule->getUnencryptedBlockSize();
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
|
Loading…
Reference in New Issue