diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-06-07 22:17:48 +0400 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 16:02:19 +0400 |
commit | aa16518f6605d1cc5311ccf5c5c78a62a75790e2 (patch) | |
tree | 0c38b6821c31f097db1db4d0b4908d1f469401f7 /settings | |
parent | 56a0b7a71a1ba98fb8c644fb9c920920a41a40fe (diff) |
only check for recovery key if someone else than the user wants to change the password
Conflicts:
settings/ajax/changepassword.php
Diffstat (limited to 'settings')
-rw-r--r-- | settings/ajax/changepassword.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 5bdc589da34..96a17c51b46 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -29,7 +29,7 @@ if (is_null($userstatus)) { } if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') { -//handle the recovery case + //handle the recovery case $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username); $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'); |