summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRoeland Douma <rullzer@users.noreply.github.com>2015-07-23 16:15:19 +0200
committerRoeland Douma <rullzer@users.noreply.github.com>2015-07-23 16:15:19 +0200
commit0e6c4e19024902efcf68e3c444bd8078a3fdab31 (patch)
treeea6bbba8af680b31962dfcc3a3a7d32001e7e1c8 /settings
parent9ccf94ca06806ad5312d3ac06b8b25388f3ec5f4 (diff)
parent3841bb1c07299165a3a70a1adb05eeab56ec6068 (diff)
downloadnextcloud-server-0e6c4e19024902efcf68e3c444bd8078a3fdab31.tar.gz
nextcloud-server-0e6c4e19024902efcf68e3c444bd8078a3fdab31.zip
Merge pull request #17818 from owncloud/fix-password-change-error-always-shows-default-error
assign password change error message to correct object
Diffstat (limited to 'settings')
-rw-r--r--settings/js/personal.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 3745b1372ea..ac18f525809 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -194,9 +194,9 @@ $(document).ready(function () {
$('#password-error').removeClass('inlineblock').addClass('hidden');
} else {
if (typeof(data.data) !== "undefined") {
- $('#passworderror').html(data.data.message);
+ $('#password-error').html(data.data.message);
} else {
- $('#passworderror').html(t('Unable to change password'));
+ $('#password-error').html(t('Unable to change password'));
}
// Hide a possible successmsg and show errormsg
$('#password-changed').removeClass('inlineblock').addClass('hidden');