From 2f81b6a752f635d119cbb1d17e690e1deacff77d Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Tue, 14 Apr 2015 01:42:57 +0000 Subject: [PATCH] Login: Don't overwrite message if not attempting login (restores Password Reset 'Reset Link Sent' message). --- login.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/login.php b/login.php index fef2dde1fa..2f6d8c39e2 100644 --- a/login.php +++ b/login.php @@ -62,8 +62,10 @@ include "root.php"; require_once "resources/require.php"; //restore message - $_SESSION["message_mood"] = $message_mood; - $_SESSION["message"] = $message; + if ($message != '') { + $_SESSION["message_mood"] = $message_mood; + $_SESSION["message"] = $message; + } //use custom login, if present, otherwise use default login if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/login.php")){