summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-05-08 12:38:09 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-05-08 12:38:09 +0200
commit135991474b7674881676dc6a9913bf6c778fdebc (patch)
tree7c63cbe38918cf2a9e63fc0e045ba98bcaf67718 /settings
parentd3ba20fee7e6a79591db392e94a38831d234639a (diff)
downloadnextcloud-server-135991474b7674881676dc6a9913bf6c778fdebc.tar.gz
nextcloud-server-135991474b7674881676dc6a9913bf6c778fdebc.zip
fix inconsistent post parameters in change password operation
Diffstat (limited to 'settings')
-rw-r--r--settings/ajax/changepassword.php2
-rw-r--r--settings/templates/personal.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 1fc6d0e1000..4f16bff63d5 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn();
OC_APP::loadApps();
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$password = isset($_POST["password"]) ? $_POST["password"] : null;
+$password = isset($_POST["newpassword"]) ? $_POST["newpassword"] : null;
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
$userstatus = null;
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 666cb9d0b36..cfb45e99c4d 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -38,7 +38,7 @@ if($_['passwordChangeSupported']) {
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
- <input type="password" id="pass2" name="new-password"
+ <input type="password" id="pass2" name="newpassword"
placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />