From 47f59d2e421ab38dbf0625d6dfd9c2f21fa11ec1 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 4 Oct 2013 10:37:58 +0200 Subject: [PATCH] we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually --- apps/files/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/index.php b/apps/files/index.php index ecd539dbed..42eac209b2 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -104,8 +104,8 @@ if ($needUpgrade) { $storageInfo=OC_Helper::getStorageInfo($dir); $maxUploadFilesize=OCP\Util::maxUploadFilesize($dir); $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'); - // if the encryption app is disabled, than everything is fine - $encryptionInitStatus = \OCA\Encryption\Session::INIT_SUCCESSFUL; + // if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code) + $encryptionInitStatus = 2; if (OC_App::isEnabled('files_encryption')) { $publicUploadEnabled = 'no'; $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));