summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-10 17:25:16 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-21 17:56:56 +0100
commitb10b8a470b07d5293e101326a08309afdc58d49a (patch)
tree5b2ab88d6a66214a48d2aad53c84e5bd9a0340df /apps
parent23ffdcc314e2c1dfbe8066f07555e7d83df01e9d (diff)
downloadnextcloud-server-b10b8a470b07d5293e101326a08309afdc58d49a.tar.gz
nextcloud-server-b10b8a470b07d5293e101326a08309afdc58d49a.zip
Fixed warning when browsing Shared folder
The virtual "Shared" folder doesn't have an unencrypted_size field. This fix adds a check to prevent warnings in the log. Backport of 022d76c from master
Diffstat (limited to 'apps')
-rw-r--r--apps/files_encryption/lib/proxy.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 22b06da429c..2daf5b29b2e 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -343,7 +343,7 @@ class Proxy extends \OC_FileProxy {
\OC_FileProxy::$enabled = false;
$fileInfo = $view->getFileInfo($path);
\OC_FileProxy::$enabled = $proxyState;
- if ($fileInfo['unencrypted_size'] > 0) {
+ if (isset($fileInfo['unencrypted_size']) && $fileInfo['unencrypted_size'] > 0) {
return $fileInfo['unencrypted_size'];
}
return $size;