diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-26 16:27:14 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-26 16:27:14 +0200 |
| commit | 62b8c36a40228192a936e823cda83c269147af91 (patch) | |
| tree | 88a3a68d679021ecdf29d6d545843ba8246254db /apps/files_encryption/lib/proxy.php | |
| parent | b9d6539d768bcad2cf7e07a95c379184f0ab2047 (diff) | |
| download | nextcloud-server-62b8c36a40228192a936e823cda83c269147af91.tar.gz nextcloud-server-62b8c36a40228192a936e823cda83c269147af91.zip | |
check if encryption app is enabled before trying to calculate file size
Diffstat (limited to 'apps/files_encryption/lib/proxy.php')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 4ec810a5199..6f630c83a3f 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -317,7 +317,7 @@ class Proxy extends \OC_FileProxy { public function postGetFileInfo($path, $data) { // if path is a folder do nothing - if (is_array($data) && array_key_exists('size', $data)) { + if (\OCP\App::isEnabled('files_encryption') && is_array($data) && array_key_exists('size', $data)) { // Disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; |