From 859a7a117acd8c7830a53a8c528790612e1638c4 Mon Sep 17 00:00:00 2001
From: Steffen185 <steffen.weber@gmail.com>
Date: Tue, 02 Apr 2013 02:42:49 -0400
Subject: [PATCH] Fixed wrong copy-paste
---
plugins/password/password.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 43cab7f..e16b4d0 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -146,9 +146,13 @@
else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
$rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
}
- // try to save the password
+ // password is the same as the old one, do nothing, return success
else if ($sespwd == $newpwd && !$rcmail->config->get('password_force_save')) {
$rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
+ }
+ // try to save the password
+ else if (!($res = $this->_save($curpwd, $newpwd))) {
+ $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
// allow additional actions after password change (e.g. reset some backends)
$plugin = $rcmail->plugins->exec_hook('password_change', array(
--
Gitblit v1.9.1