diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-26 00:03:54 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-26 00:03:54 +0100 |
| commit | 46dff0677d3eff1aa4da94865e82698229dd71e0 (patch) | |
| tree | 91b96385b6a5725592bf68169f9d862b007bf14c /apps/files_encryption/lib/stream.php | |
| parent | acf74b24f24e1c2ea9e454a1c09f6bcf404f6627 (diff) | |
| parent | 5310a5924b18849c85b482819c350d72a6d0c67c (diff) | |
| download | nextcloud-server-46dff0677d3eff1aa4da94865e82698229dd71e0.tar.gz nextcloud-server-46dff0677d3eff1aa4da94865e82698229dd71e0.zip | |
Merge branch 'master' into calc_version_size
Diffstat (limited to 'apps/files_encryption/lib/stream.php')
| -rw-r--r-- | apps/files_encryption/lib/stream.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index 1738955d1aa..1186a5f1d8d 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -250,7 +250,7 @@ class Stream { // Fetch and decrypt keyfile // Fetch existing keyfile - $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->userId, $this->relPath); + $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->relPath); // If a keyfile already exists if ($this->encKeyfile) { @@ -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 |