summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-08-12 15:16:16 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-08-12 19:27:09 +0200
commit7aa35e9f248d7c29f1c930aec76658e2a56875da (patch)
treeb033c89961826fdb2da5e7c8b64c99f73a0453df /settings
parent9f9c18bd7492e396c7921b42e34245b25dd6b116 (diff)
downloadnextcloud-server-7aa35e9f248d7c29f1c930aec76658e2a56875da.tar.gz
nextcloud-server-7aa35e9f248d7c29f1c930aec76658e2a56875da.zip
fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser
Diffstat (limited to 'settings')
-rw-r--r--settings/changepassword/controller.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 052715555e5..ee596c3e7ed 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -56,7 +56,7 @@ class Controller {
$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$validRecoveryPassword = false;
- $recoveryPasswordSupported = false;
+ $recoveryEnabledForUser = false;
if ($recoveryAdminEnabled) {
$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
@@ -74,14 +74,14 @@ class Controller {
)));
} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
$result = \OC_User::setPassword($username, $password, $recoveryPassword);
- if (!$result && $recoveryPasswordSupported) {
+ if (!$result && $recoveryEnabledForUser) {
$l = new \OC_L10n('settings');
\OC_JSON::error(array(
"data" => array(
"message" => $l->t("Back-end doesn't support password change, but the users encryption key was successfully updated.")
)
));
- } elseif (!$result && !$recoveryPasswordSupported) {
+ } elseif (!$result && !$recoveryEnabledForUser) {
$l = new \OC_L10n('settings');
\OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change password" ) )));
} else {