]> source.dussan.org Git - nextcloud-server.git/commitdiff
check if encryption app is enabled before trying to calculate file size
authorBjoern Schiessle <schiessle@owncloud.com>
Thu, 26 Sep 2013 14:27:14 +0000 (16:27 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Thu, 26 Sep 2013 14:27:14 +0000 (16:27 +0200)
apps/files_encryption/lib/proxy.php

index 4ec810a51996e817cca39324e8a9bbf0ec4fe6c5..6f630c83a3f5b277477155e461331aaeef840a07 100644 (file)
@@ -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;