aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-01-17 14:38:14 +0100
committerRobin Appelman <icewind@owncloud.com>2014-01-17 14:38:14 +0100
commit299bb4d99db935bb529a30fe6ae0c9bc72344d69 (patch)
treec4e371688030787715c5c3b00bb8d8365691bc42 /apps/files_encryption/lib
parent642d8e370e366bab6734a07aca78c4d0c8eca1c0 (diff)
downloadnextcloud-server-299bb4d99db935bb529a30fe6ae0c9bc72344d69.tar.gz
nextcloud-server-299bb4d99db935bb529a30fe6ae0c9bc72344d69.zip
remove more is_array from encryption
Diffstat (limited to 'apps/files_encryption/lib')
-rw-r--r--apps/files_encryption/lib/proxy.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 70077e5e1f5..c1b60799e64 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -307,7 +307,7 @@ class Proxy extends \OC_FileProxy {
public function postGetFileInfo($path, $data) {
// if path is a folder do nothing
- if (\OCP\App::isEnabled('files_encryption') && is_array($data) && array_key_exists('size', $data)) {
+ if (\OCP\App::isEnabled('files_encryption') && $data !== false && array_key_exists('size', $data)) {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -378,7 +378,7 @@ class Proxy extends \OC_FileProxy {
$size = $fileInfo['unencrypted_size'];
} else {
// self healing if file was removed from file cache
- if (!is_array($fileInfo)) {
+ if (!$fileInfo) {
$fileInfo = array();
}