Merge pull request #12552 from nextcloud/fix/11146/respect_disabled_p…

…assword_reset Respect the disabled setting for lost_password_link
nextcloud · Nov 20, 2018 · e73bfd5 · e73bfd5
2 parents ebc690b + 43d6ae7
commit e73bfd5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
@@ -232,7 +232,9 @@ private function setPasswordResetParameters(
 		$parameters['resetPasswordLink'] = $this->config
 			->getSystemValue('lost_password_link', '');
 
-		if (!$parameters['resetPasswordLink'] && $userObj !== null) {
+		if ($parameters['resetPasswordLink'] === 'disabled') {
+			$parameters['canResetPassword'] = false;
+		} else if (!$parameters['resetPasswordLink'] && $userObj !== null) {
 			$parameters['canResetPassword'] = $userObj->canChangePassword();
 		} else if ($userObj !== null && $userObj->isEnabled() === false) {
 			$parameters['canResetPassword'] = false;