From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 4 Oct 2013 08:37:58 +0000 (+0200)
Subject: we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we... 
X-Git-Tag: v6.0.0alpha2~104^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=47f59d2e421ab38dbf0625d6dfd9c2f21fa11ec1;p=nextcloud-server.git

we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
---

diff --git a/apps/files/index.php b/apps/files/index.php
index ecd539dbed4..42eac209b23 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('/'));