aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/settings.php4
-rw-r--r--view/settings.tpl2
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 0cac6e0de..71109d903 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -24,9 +24,9 @@ function settings_post(&$a) {
notice( t('Permission denied.') . EOL);
return;
}
- if((x($_POST,'password')) || (x($_POST,'confirm'))) {
+ if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
- $newpass = trim($_POST['password']);
+ $newpass = trim($_POST['npassword']);
$confirm = trim($_POST['confirm']);
$err = false;
diff --git a/view/settings.tpl b/view/settings.tpl
index 00c85cb40..ce13e2e2e 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -74,7 +74,7 @@ $profile_in_net_dir
Leave password fields blank unless changing
</p>
<label id="settings-password-label" for="settings-password" >New Password: </label>
-<input type="password" id="settings-password" name="password" ></input>
+<input type="password" id="settings-password" name="npassword" ></input>
</div>
<div id="settings-password-end" ></div>