diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-11-15 08:18:48 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-11-15 08:18:48 +0100 |
| commit | 3067458acbff330d144bddd779492d9b247b04b4 (patch) | |
| tree | 18bb17a031669da63d4424cdeb748609df67d503 | |
| parent | 0f6e9f0bf692ae87be460eb3553e3f55349d725b (diff) | |
Fix wrong (non-specific) error message on crypt or connection error (#1488808)
| -rw-r--r-- | plugins/password/package.xml | 33 | ||||
| -rw-r--r-- | plugins/password/password.php | 2 |
2 files changed, 26 insertions, 9 deletions
diff --git a/plugins/password/package.xml b/plugins/password/package.xml index 29d222409..e639a04ef 100644 --- a/plugins/password/package.xml +++ b/plugins/password/package.xml @@ -15,9 +15,9 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date>2012-03-07</date> + <date>2012-11-15</date> <version> - <release>3.1</release> + <release>3.2</release> <api>2.0</api> </version> <stability> @@ -26,13 +26,7 @@ </stability> <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> <notes> -- Added pw_usermod driver (#1487826) -- Added option password_login_exceptions (#1487826) -- Added domainfactory driver (#1487882) -- Added DBMail driver (#1488281) -- Helper files moved to helpers/ directory from drivers/ -- Added Expect driver (#1488363) -- Added Samba password (#1488364) +- Fix wrong (non-specific) error message on crypt or connection error (#1488808) </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -331,5 +325,26 @@ - Fixed drivers namespace issues </notes> </release> + <release> + <date>2012-03-07</date> + <version> + <release>3.1</release> + <api>2.0</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> + <notes> +- Added pw_usermod driver (#1487826) +- Added option password_login_exceptions (#1487826) +- Added domainfactory driver (#1487882) +- Added DBMail driver (#1488281) +- Helper files moved to helpers/ directory from drivers/ +- Added Expect driver (#1488363) +- Added Samba password (#1488364) + </notes> + </release> </changelog> </package> diff --git a/plugins/password/password.php b/plugins/password/password.php index 58b6f8cd9..e795d115f 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -274,8 +274,10 @@ class password extends rcube_plugin return; case PASSWORD_CRYPT_ERROR; $reason = $this->gettext('crypterror'); + break; case PASSWORD_CONNECT_ERROR; $reason = $this->gettext('connecterror'); + break; case PASSWORD_ERROR: default: $reason = $this->gettext('internalerror'); |