From 38ffacf68728df82d58b9ec3208791fcec18f362 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Wed, 11 Nov 2020 10:32:50 -0700
Subject: [PATCH] notification emails replace placeolders in From
---
server/lib/classes/monitor_tools.inc.php | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index a44324528b..dbe702d0dd 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -865,6 +865,7 @@ class monitor_tools {
//* Replace placeholders
$mailHeaders = strtr($mailHeaders, $placeholders);
+ $mailFrom = strtr($mailFrom, $placeholders);
$mailSubject = strtr($mailSubject, $placeholders);
$mailBody = strtr($mailBody, $placeholders);
@@ -872,11 +873,6 @@ class monitor_tools {
$app->functions->mail($recipients[$r], $mailSubject, $mailBody, $mailFrom);
}
- unset($mailSubject);
- unset($mailHeaders);
- unset($mailBody);
- unset($lines);
-
return true;
}
--
GitLab