[Pkg-owncloud-commits] [owncloud] 60/70: fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.5RC1
in repository owncloud.

commit ffe3bd14290ec4f2f4c38783e5050273858cddb9
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Tue Aug 12 15:16:16 2014 +0200

    fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser
---
 settings/changepassword/controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index e8c2a19..dc70833 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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git