From b25ab94a08ab9ba5e322043ac470d5352d456c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
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
---
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 90d213f179..e8adb8c959 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -27,7 +27,7 @@ if (is_null($userstatus)) {
OC_JSON::error(array('data' => array('message' => 'Authentication error')));
exit();
}
-if (\OCP\App::isEnabled('files_encryption')) {
+if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') {
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
--
GitLab