diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2014-07-06 10:38:06 -0400 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2014-07-06 10:38:06 -0400 |
| commit | a4686876822624a47435ab045568222b3971c083 (patch) | |
| tree | bd7f8eaaf6e1cb04864cfb00f477e0c95ded427f /apps/files_encryption/lib | |
| parent | 1f29bd18e91e83f48c2f4d3c8f345ec9e9172a36 (diff) | |
| parent | 5397101e1cc1d54896c6572094337dd5777e1072 (diff) | |
| download | nextcloud-server-a4686876822624a47435ab045568222b3971c083.tar.gz nextcloud-server-a4686876822624a47435ab045568222b3971c083.zip | |
Merge pull request #9453 from owncloud/enc_fix_wrong_file_size
[encryption] always take unencrypted size
Diffstat (limited to 'apps/files_encryption/lib')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index b1af4676852..852b9111c12 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -157,8 +157,8 @@ class Proxy extends \OC_FileProxy { // store new unenecrypted size so that it can be updated // in the post proxy $tmpFileInfo = $view->getFileInfo($tmpPath); - if ( isset($tmpFileInfo['size']) ) { - self::$unencryptedSizes[\OC\Files\Filesystem::normalizePath($path)] = $tmpFileInfo['size']; + if ( isset($tmpFileInfo['unencrypted_size']) ) { + self::$unencryptedSizes[\OC\Files\Filesystem::normalizePath($path)] = $tmpFileInfo['unencrypted_size']; } // remove our temp file |