From e66d16ac64ac82f6e92b70fcdc33a56db5b34b26 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 12 Jan 2011 19:44:14 +0000
Subject: - Fix extended error messages handling (#1487676)

git-svn-id: https://svn.roundcube.net/trunk@4413 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/password/package.xml  | 1 +
 plugins/password/password.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/password/package.xml b/plugins/password/package.xml
index 1d63142d9..061de07de 100644
--- a/plugins/password/package.xml
+++ b/plugins/password/package.xml
@@ -34,6 +34,7 @@
 - ldap_simple driver: fix parse error
 - ldap/ldap_simple drivers: support %dc variable in config
 - ldap/ldap_simple drivers: support Samba password change
+- Fix extended error messages handling (#1487676)
     </notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 6d3042b5f..b675b079c 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -232,8 +232,8 @@ class password extends rcube_plugin
         $result = password_save($curpass, $passwd);
 
         if (is_array($result)) {
-            $result  = $result['code'];
             $message = $result['message'];
+            $result  = $result['code'];
         }
 
         switch ($result) {
-- 
cgit v1.2.3