From b69fb3a0892349af3a728e607b173d56bfca36bd Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Apr 2020 08:33:14 +0200
Subject: [PATCH] Fix wrong redirection when using custom pages + show flash
 messages

BT#17022
---
 custompages/index-unlogged-dist.php | 9 ++++++---
 main/auth/lostPassword.php          | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/custompages/index-unlogged-dist.php b/custompages/index-unlogged-dist.php
index 6faa2546ca..6ced6fb27b 100644
--- a/custompages/index-unlogged-dist.php
+++ b/custompages/index-unlogged-dist.php
@@ -75,9 +75,12 @@ $rootWeb = api_get_path('WEB_PATH');
 		</div> <!-- #header -->
 		<div id="login-form-box" class="form-box">
             <div id="login-form-info" class="form-info">
-            <?php if (isset($content['info']) && !empty($content['info'])) {
-    echo $content['info'];
-}
+            <?php
+                echo Display::getFlashToString();
+                Display::cleanFlashMessages();
+                if (isset($content['info']) && !empty($content['info'])) {
+                    echo $content['info'];
+                }
             ?>
             </div>
             <?php if (isset($error_message)) {
diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php
index 055ccb6720..627fb9c4ba 100755
--- a/main/auth/lostPassword.php
+++ b/main/auth/lostPassword.php
@@ -36,13 +36,13 @@ $tool_name = get_lang('LostPassword');
 if ($reset && $userId) {
     $messageText = Login::reset_password($reset, $userId, true);
 
-    if (CustomPages::enabled() && CustomPages::exists(CustomPages::INDEX_UNLOGGED)) {
+    /*if (CustomPages::enabled() && CustomPages::exists(CustomPages::INDEX_UNLOGGED)) {
         CustomPages::display(
             CustomPages::INDEX_UNLOGGED,
             ['info' => $messageText]
         );
         exit;
-    }
+    }*/
 
     Display::addFlash(
         Display::return_message($messageText, 'info', false)