summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-01-17 12:56:17 +0100
committerRobin Appelman <icewind@owncloud.com>2014-01-17 12:56:17 +0100
commitec7c339930618726f2f87899546ab7bc80ca96d5 (patch)
tree6670967081b254e04da76640438124c6d5b4b03d /apps/files_encryption
parentc01949ec0eb54dbfbb2c29e43606b3a72ee42852 (diff)
downloadnextcloud-server-ec7c339930618726f2f87899546ab7bc80ca96d5.tar.gz
nextcloud-server-ec7c339930618726f2f87899546ab7bc80ca96d5.zip
Don't use is_array on FileInfo
Diffstat (limited to 'apps/files_encryption')
-rw-r--r--apps/files_encryption/lib/proxy.php4
-rw-r--r--apps/files_encryption/lib/stream.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 41f352d853a..70077e5e1f5 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -117,7 +117,7 @@ class Proxy extends \OC_FileProxy {
// update file cache for target file
$tmpFileInfo = $view->getFileInfo($tmpPath);
$fileInfo = $view->getFileInfo($path);
- if (is_array($fileInfo) && is_array($tmpFileInfo)) {
+ if ($fileInfo && $tmpFileInfo) {
$fileInfo['encrypted'] = true;
$fileInfo['unencrypted_size'] = $tmpFileInfo['size'];
$view->putFileInfo($path, $fileInfo);
@@ -365,7 +365,7 @@ class Proxy extends \OC_FileProxy {
}
// if file is encrypted return real file size
- if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
+ if ($fileInfo && $fileInfo['encrypted'] === true) {
// try to fix unencrypted file size if it doesn't look plausible
if ((int)$fileInfo['size'] > 0 && (int)$fileInfo['unencrypted_size'] === 0 ) {
$fixSize = $util->getFileSize($path);
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index b3bf34ddb82..88eacc6f136 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -567,7 +567,7 @@ class Stream {
// get file info
$fileInfo = $this->rootView->getFileInfo($path);
- if (is_array($fileInfo)) {
+ if ($fileInfo) {
// set encryption data
$fileInfo['encrypted'] = true;
$fileInfo['size'] = $this->size;