diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 10:33:37 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 10:33:37 +0100 |
| commit | 16b484209c4792ce8c43f197d678e3fb393b3ee5 (patch) | |
| tree | f256bbf248d9680061898ebd8f4aa1f292fc7733 /apps/files_encryption/lib/proxy.php | |
| parent | 2b361ea085812a7b97102d026c421905549b5142 (diff) | |
| parent | 391f267d380f0d098d730d3bc74633192cc13570 (diff) | |
| download | nextcloud-server-16b484209c4792ce8c43f197d678e3fb393b3ee5.tar.gz nextcloud-server-16b484209c4792ce8c43f197d678e3fb393b3ee5.zip | |
Merge branch 'master' into encryption_work_with_public_gallery
Conflicts:
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'apps/files_encryption/lib/proxy.php')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index f7253b4591b..b0b2b62aa1b 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -350,7 +350,10 @@ class Proxy extends \OC_FileProxy { $fileInfo = false; // get file info from database/cache if not .part file if (!Helper::isPartialFilePath($path)) { + $proxyState = \OC_FileProxy::$enabled; + \OC_FileProxy::$enabled = false; $fileInfo = $view->getFileInfo($path); + \OC_FileProxy::$enabled = $proxyState; } // if file is encrypted return real file size |