mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset 

Fix for extstorage + encryption where unencrypted size is not kept
This commit is contained in:
Vincent Petry 2013-11-20 09:04:37 -08:00
parent a88aec8a5c fe44024868
commit 5de5c317c1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files_encryption/lib/proxy.php
View File

@ -349,7 +349,10 @@ class Proxy extends \OC_FileProxy {
$fileInfo = false; $fileInfo = false;
// get file info from database/cache if not .part file // get file info from database/cache if not .part file
if (!Helper::isPartialFilePath($path)) { if (!Helper::isPartialFilePath($path)) {
$proxyState = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$fileInfo = $view->getFileInfo($path); $fileInfo = $view->getFileInfo($path);
\OC_FileProxy::$enabled = $proxyState;
} }
// if file is encrypted return real file size // if file is encrypted return real file size

3
apps/files_encryption/lib/stream.php
View File

@ -491,7 +491,8 @@ class Stream {
if ( if (
$this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'r' &&
$this->meta['mode'] !== 'rb' && $this->meta['mode'] !== 'rb' &&
$this->size > 0 $this->size > 0 &&
$this->unencryptedSize > 0
) { ) {
// only write keyfiles if it was a new file // only write keyfiles if it was a new file