diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-15 22:39:17 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-15 22:39:17 +0200 |
| commit | 257ee205bb2398a430849181436083eed428ca77 (patch) | |
| tree | 48d4e6151a250e3a66808ead24b7573e65f5f55c /settings/controller | |
| parent | 2cafbc803a6e09432bcdea7010543ed968ad5abf (diff) | |
| parent | 9727386d8b343b9ab2db7604cee012e359c2c9ad (diff) | |
| download | nextcloud-server-257ee205bb2398a430849181436083eed428ca77.tar.gz nextcloud-server-257ee205bb2398a430849181436083eed428ca77.zip | |
Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips
[enc2]fixing recovery tooltip
Diffstat (limited to 'settings/controller')
| -rw-r--r-- | settings/controller/userscontroller.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php index e9ffc36904e..d0b5267e3c8 100644 --- a/settings/controller/userscontroller.php +++ b/settings/controller/userscontroller.php @@ -122,10 +122,10 @@ class UsersController extends Controller { $this->subAdminFactory = $subAdminFactory; // check for encryption state - TODO see formatUserForIndex - $this->isEncryptionAppEnabled = $appManager->isEnabledForUser('files_encryption'); + $this->isEncryptionAppEnabled = $appManager->isEnabledForUser('encryption'); if($this->isEncryptionAppEnabled) { // putting this directly in empty is possible in PHP 5.5+ - $result = $config->getAppValue('files_encryption', 'recoveryAdminEnabled', 0); + $result = $config->getAppValue('encryption', 'recoveryAdminEnabled', 0); $this->isRestoreEnabled = !empty($result); } } @@ -148,7 +148,7 @@ class UsersController extends Controller { if ($this->isEncryptionAppEnabled) { if ($this->isRestoreEnabled) { // check for the users recovery setting - $recoveryMode = $this->config->getUserValue($user->getUID(), 'files_encryption', 'recovery_enabled', '0'); + $recoveryMode = $this->config->getUserValue($user->getUID(), 'encryption', 'recoveryEnabled', '0'); // method call inside empty is possible with PHP 5.5+ $recoveryModeEnabled = !empty($recoveryMode); if ($recoveryModeEnabled) { |