Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-06-07 22:17:48 +0400
committerBjörn Schießle <schiessle@owncloud.com>2013-06-07 22:17:48 +0400
commitb25ab94a08ab9ba5e322043ac470d5352d456c71 (patch)
treefa54fce67b803d0432d7c6496e72e11229aa891a /settings/ajax
parent7fc5151d95d7b4c6f27fd1d6207c93015da8315a (diff)
only check for recovery key if someone else than the user wants to change the password
Diffstat (limited to 'settings/ajax')
-rw-r--r--settings/ajax/changepassword.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 90d213f1792..e8adb8c959f 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();