From aa16518f6605d1cc5311ccf5c5c78a62a75790e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Fri, 7 Jun 2013 20:17:48 +0200 Subject: [PATCH] only check for recovery key if someone else than the user wants to change the password Conflicts: settings/ajax/changepassword.php --- settings/ajax/changepassword.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'); -- 2.39.5