summaryrefslogtreecommitdiffstats
path: root/apps/files/index.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-10-04 10:37:58 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-10-04 10:37:58 +0200
commit47f59d2e421ab38dbf0625d6dfd9c2f21fa11ec1 (patch)
tree04ee7be2430dca79cf4875e507c9b971ad4ee06e /apps/files/index.php
parent67d4b77e8e3bab2fe555ef589f5047c9325974e8 (diff)
downloadnextcloud-server-47f59d2e421ab38dbf0625d6dfd9c2f21fa11ec1.tar.gz
nextcloud-server-47f59d2e421ab38dbf0625d6dfd9c2f21fa11ec1.zip
we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
Diffstat (limited to 'apps/files/index.php')
-rw-r--r--apps/files/index.php4
1 files changed, 2 insertions, 2 deletions
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('/'));