diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-10-04 07:10:21 -0700 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-10-04 07:10:21 -0700 |
| commit | 2cdf54b77d2d9cc022e70012774f6979036d6deb (patch) | |
| tree | bf6096f09597a25c0883d18ed8978dbd03b40704 /apps/files_encryption | |
| parent | 7337b341106b6ae093b8d56c4d885b497db6e5aa (diff) | |
| parent | 2e7f481e6bcc9b9d2aea986c86af123f1ec265c0 (diff) | |
| download | nextcloud-server-2cdf54b77d2d9cc022e70012774f6979036d6deb.tar.gz nextcloud-server-2cdf54b77d2d9cc022e70012774f6979036d6deb.zip | |
Merge pull request #4877 from owncloud/ocs_share_api
OCS Share API
Diffstat (limited to 'apps/files_encryption')
| -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; |