aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-12-03 16:16:09 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-09 09:47:26 +0100
commit78a307995c510c0184d915fcab26baa3be815342 (patch)
tree75ded3bfb1a97de121777d553aa398981faed591 /settings
parent7f7006643f7e659c86b81720dd50b33dbbb07430 (diff)
downloadnextcloud-server-78a307995c510c0184d915fcab26baa3be815342.tar.gz
nextcloud-server-78a307995c510c0184d915fcab26baa3be815342.zip
Fix namespace of Files_Encryption outside of the app
Diffstat (limited to 'settings')
-rw-r--r--settings/ajax/decryptall.php2
-rw-r--r--settings/changepassword/controller.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
index 527e5b8fcee..0ad25927461 100644
--- a/settings/ajax/decryptall.php
+++ b/settings/ajax/decryptall.php
@@ -11,7 +11,7 @@ $params = array('uid' => \OCP\User::getUser(),
'password' => $_POST['password']);
$view = new OC\Files\View('/');
-$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
+$util = new \OCA\Files_Encryption\Util($view, \OCP\User::getUser());
$l = \OC::$server->getL10N('settings');
$result = $util->initEncryption($params);
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index ee596c3e7ed..4ed907daf96 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -52,7 +52,7 @@ class Controller {
if (\OC_App::isEnabled('files_encryption')) {
//handle the recovery case
- $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $username);
+ $util = new \OCA\Files_Encryption\Util(new \OC\Files\View('/'), $username);
$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$validRecoveryPassword = false;