aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2022-05-05 20:19:28 +0200
committerGitHub <noreply@github.com>2022-05-05 20:19:28 +0200
commit0284c0f71797cf2729633f18c5905c23457cd527 (patch)
tree28131ca9a83c2afe81d5fc57c161a25d9387ec1a /apps
parent99151a55890727253339f49406e2ceba56db47e4 (diff)
parent8a2cf5bb68617004d24469c65b68e8b01ca56621 (diff)
downloadnextcloud-server-0284c0f71797cf2729633f18c5905c23457cd527.tar.gz
nextcloud-server-0284c0f71797cf2729633f18c5905c23457cd527.zip
Merge pull request #32276 from nextcloud/fix/ldap_error_handling
Do not dispatch postSetPassword when setPassword fails
Diffstat (limited to 'apps')
-rw-r--r--apps/settings/lib/Controller/ChangePasswordController.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
index 8dd1e6ba028..85e4218ebb5 100644
--- a/apps/settings/lib/Controller/ChangePasswordController.php
+++ b/apps/settings/lib/Controller/ChangePasswordController.php
@@ -109,7 +109,10 @@ class ChangePasswordController extends Controller {
try {
if ($newpassword === null || $user->setPassword($newpassword) === false) {
return new JSONResponse([
- 'status' => 'error'
+ 'status' => 'error',
+ 'data' => [
+ 'message' => $this->l->t('Unable to change personal password'),
+ ],
]);
}
// password policy app throws exception