Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore replyTo elseif logic to preserve old behavior

Browse Source 
customMailOptions replyTo and smtp replyTo are mutually exclusive,
matching the original PHPMailer implementation.
This commit is contained in:
Chirag Aggarwal
2026-04-01 16:37:08 +05:30
parent ce63b00cf4
commit f1dc468e50
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Platform/Workers/Mails.php
+7 -10
View File
@@ -160,11 +160,6 @@ class Mails extends Action
$replyTo = $defaultFromEmail;
$replyToName = $defaultFromName;
if (!empty($smtp)) {
$replyTo = !empty($smtp['replyTo']) ? $smtp['replyTo'] : ($smtp['senderEmail'] ?? $replyTo);
$replyToName = $smtp['senderName'] ?? $replyToName;
}
$customMailOptions = $payload['customMailOptions'] ?? [];
if (!empty($customMailOptions['senderEmail'])) {
@@ -173,11 +168,13 @@ class Mails extends Action
if (!empty($customMailOptions['senderName'])) {
$fromName = $customMailOptions['senderName'];
}
if (!empty($customMailOptions['replyToEmail'])) {
$replyTo = $customMailOptions['replyToEmail'];
}
if (!empty($customMailOptions['replyToName'])) {
$replyToName = $customMailOptions['replyToName'];
if (!empty($customMailOptions['replyToEmail']) || !empty($customMailOptions['replyToName'])) {
$replyTo = $customMailOptions['replyToEmail'] ?? $replyTo;
$replyToName = $customMailOptions['replyToName'] ?? $replyToName;
} elseif (!empty($smtp)) {
$replyTo = !empty($smtp['replyTo']) ? $smtp['replyTo'] : ($smtp['senderEmail'] ?? $replyTo);
$replyToName = $smtp['senderName'] ?? $replyToName;
}
$attachments = null;