summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-24 14:31:32 +0200
committerkondou <kondou@ts.unde.re>2013-08-24 14:31:32 +0200
commitfbe7a68ce8837fd60f36ba21298c8e8cd68f42fe (patch)
tree344f5acba0ac5f58149d8fa9ae525a1801339fc7
parent596ac40b7f7143622ce2fabf48b96b4320e8c582 (diff)
downloadnextcloud-server-fbe7a68ce8837fd60f36ba21298c8e8cd68f42fe.tar.gz
nextcloud-server-fbe7a68ce8837fd60f36ba21298c8e8cd68f42fe.zip
Use personal-password for the password name in personal.php
Fix #4491
-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 d409904ebc7..47ceb5ab873 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['personal-password']) ? $_POST['personal-password'] : null;
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index bad88142da9..63e1258b958 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -40,7 +40,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="password"
+ <input type="password" id="pass2" name="personal-password"
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');?>" />