From 4df2c187f7e11cc2803ce3f2b1b94759b3d6f3f8 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Wed, 28 Sep 2022 01:40:14 +0200
Subject: [PATCH] Internal: Message: Fix e-mail sender (if provided) - refs
 BT#20235 Also might affect other e-mail sending processes. Was using global
 platform sender setting before, no matter what.

---
 public/main/inc/lib/notification.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/main/inc/lib/notification.lib.php b/public/main/inc/lib/notification.lib.php
index 3d80a85de4..b7801d32cf 100644
--- a/public/main/inc/lib/notification.lib.php
+++ b/public/main/inc/lib/notification.lib.php
@@ -318,8 +318,8 @@ class Notification extends Model
                                 $userInfo['mail'],
                                 Security::filter_terms($titleToNotification),
                                 Security::filter_terms($content),
-                                $this->adminName,
-                                $this->adminEmail,
+                                !empty($senderInfo['complete_name']) ? $senderInfo['complete_name'] : $this->adminName,
+                                !empty($senderInfo['email']) ? $senderInfo['email'] : $this->adminEmail,
                                 $extraHeaders,
                                 $attachments,
                                 false