From: Florin Peter <github@florin-peter.de>
Date: Mon, 6 May 2013 19:15:25 +0000 (+0200)
Subject: fix file info put on stream
X-Git-Tag: v6.0.0alpha2~743^2~117
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe6d12ddec46e5d68486d5db22a8508a2ab2b2ea;p=nextcloud-server.git

fix file info put on stream
---

diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index a51f2c56d95..eb1cb45871c 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -512,7 +512,19 @@ class Stream {
             // Re-enable proxy - our work is done
             \OC_FileProxy::$enabled = $proxyStatus;
 
-			\OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => 1, 'size' => $this->size, 'unencrypted_size' => $this->unencryptedSize ), '' );
+            // get file info
+            $fileInfo = \OC\Files\Filesystem::getFileInfo($this->rawPath);
+            if(!is_array($fileInfo)) {
+                $fileInfo = array();
+            }
+
+            // set encryption data
+            $fileInfo['encrypted'] = 1;
+            $fileInfo['size'] = $this->size;
+            $fileInfo['unencrypted_size'] = $this->unencryptedSize;
+
+            // set fileinfo
+			\OC\Files\Filesystem::putFileInfo( $this->rawPath, $fileInfo);
 		}
 
 		return fclose( $this->handle );