aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib/stream.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-11-20 09:04:37 -0800
committerVincent Petry <pvince81@owncloud.com>2013-11-20 09:04:37 -0800
commit5de5c317c1976a5b4fe5139f15cc875a72b1e5d7 (patch)
treed3d2bb9acbebde83448e735a4937f813717ce9fa /apps/files_encryption/lib/stream.php
parenta88aec8a5c199a6a0304abe2d196a0f2f93d0a66 (diff)
parentfe440248683fb74d758dd257272efcffb7e3c325 (diff)
downloadnextcloud-server-5de5c317c1976a5b4fe5139f15cc875a72b1e5d7.tar.gz
nextcloud-server-5de5c317c1976a5b4fe5139f15cc875a72b1e5d7.zip
Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset
Fix for extstorage + encryption where unencrypted size is not kept
Diffstat (limited to 'apps/files_encryption/lib/stream.php')
-rw-r--r--apps/files_encryption/lib/stream.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 206e3469023..1186a5f1d8d 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -491,7 +491,8 @@ class Stream {
if (
$this->meta['mode'] !== 'r' &&
$this->meta['mode'] !== 'rb' &&
- $this->size > 0
+ $this->size > 0 &&
+ $this->unencryptedSize > 0
) {
// only write keyfiles if it was a new file