From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 31 Mar 2015 10:06:36 +0000 (+0200)
Subject: Fix settings
X-Git-Tag: v8.1.0alpha1~78^2~72
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f5638d9163d7f46752351eb90ba2f3b381d68dc0;p=nextcloud-server.git

Fix settings
---

diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php
index a34d30d1de5..36e9c532bbd 100644
--- a/apps/encryption/settings/settings-admin.php
+++ b/apps/encryption/settings/settings-admin.php
@@ -6,16 +6,16 @@
  * See the COPYING-README file.
  */
 
-use OCA\Encryption\KeyManager;
-
 \OC_Util::checkAdminUser();
 
 $tmpl = new OCP\Template('encryption', 'settings-admin');
 
 // Check if an adminRecovery account is enabled for recovering files after lost pwd
 $recoveryAdminEnabled = \OC::$server->getConfig()->getAppValue('encryption', 'recoveryAdminEnabled', '0');
+$session = new \OCA\Encryption\Session(\OC::$server->getSession());
+
 
 $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
-$tmpl->assign('initStatus', KeyManager::$session->get('initStatus'));
+$tmpl->assign('initStatus', $session->getStatus());
 
 return $tmpl->fetchPage();
diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php
index 83594b8467e..a4173dbd40f 100644
--- a/apps/encryption/settings/settings-personal.php
+++ b/apps/encryption/settings/settings-personal.php
@@ -22,7 +22,7 @@ $keymanager = new \OCA\Encryption\KeyManager(
 	\OC::$server->getConfig(),
 	\OC::$server->getUserSession(),
 	$session,
-	\OC::$server->getLogger());
+	\OC::$server->getLogger(), null);
 
 $user = \OCP\User::getUser();