From fc472ad14ec52c48cc31b930d393b737822eb494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@opensides.be>
Date: Mon, 26 Jan 2015 11:02:00 +0100
Subject: [PATCH] Fixes #3540 Fixed error handling in password recovery

---
 html/class_passwordRecovery.inc |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 94ffc59..1cca78e 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -171,7 +171,9 @@ class passwordRecovery {
         $this->step4();
       } elseif (isset($_POST['apply'])) {
         $this->step2();
-        $this->step3();
+        if ($this->step == 2) { /* No errors */
+          $this->step3();
+        }
       }
     } elseif ($_SERVER["REQUEST_METHOD"] == "GET") {
       if (isset($_GET['uniq'])) {
@@ -610,7 +612,6 @@ class passwordRecovery {
            escapeshellarg($this->uid)." ".escapeshellarg($_POST['new_password']), $resarr);
       if (count($resarr) > 0) {
         $this->message[] = _("External password changer reported a problem: ".join('\n', $resarr));
-        msg_dialog::displayChecks($this->message);
         return;
       }
     }
-- 
1.7.10.4