diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-09 13:06:40 -0700 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-09 13:06:40 -0700 |
| commit | c112ac440822c354818e3b904194c957b580b608 (patch) | |
| tree | c588df1cf104b3dffa1a879ff5af39ac3b307e35 | |
| parent | 2e81efc37eeb95b7e5d392349ad393bb94d6928a (diff) | |
| parent | 135991474b7674881676dc6a9913bf6c778fdebc (diff) | |
| download | nextcloud-server-c112ac440822c354818e3b904194c957b580b608.tar.gz nextcloud-server-c112ac440822c354818e3b904194c957b580b608.zip | |
Merge pull request #3277 from owncloud/fix-change-password
fix inconsistent post parameters in change password operation
| -rw-r--r-- | settings/ajax/changepassword.php | 2 | ||||
| -rw-r--r-- | settings/templates/personal.php | 2 |
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');?>" /> |