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:
authorBjoern Schiessle <schiessle@owncloud.com>2014-08-12 17:16:16 +0400
committerBjoern Schiessle <schiessle@owncloud.com>2014-08-12 21:28:05 +0400
commitffe3bd14290ec4f2f4c38783e5050273858cddb9 (patch)
tree1f16907d2f7f060199c33aea822c912c5e4e8cd1 /settings
parent851d4786912be18fda7ff90a270a88dd7ecb2d8d (diff)
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 e8c2a1943f3..dc708333443 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -62,7 +62,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();
@@ -80,14 +80,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 {