Merge pull request #399 from Patta/bugfix/recipientname

[BUGFIX] Avoid empty recipient name
kartolo · Jun 8, 2023 · 9ccca4b · 9ccca4b
2 parents 733ab56 + 9b245f5
commit 9ccca4b
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Classes/Dmailer.php b/Classes/Dmailer.php
@@ -417,7 +417,17 @@ public function sendAdvanced(array $recipientRow, string $tableNameChar): int
             $this->dmailer['sys_dmail_rec']['return_path'] = str_replace('###XID###', $midRidId, $this->dmailer['sys_dmail_rec']['return_path']);
 
             if ($returnCode) {
-                $recipient = $this->createRecipient($recipientRow['email'], $this->ensureCorrectEncoding($recipientRow['name']));
+                $recipientName = $recipientRow['name'] ?? '';
+                if ($recipientName == '') {
+                    if ($recipientRow['first_name'] ?? '') {
+                        $recipientName = $recipientRow['first_name'] . ' ';
+                    }
+                    if ($recipientRow['middle_name'] ?? '') {
+                        $recipientName .= $recipientRow['middle_name'] . ' ';
+                    }
+                    $recipientName .= $recipientRow['last_name'] ?? '';
+                }
+                $recipient = $this->createRecipient($recipientRow['email'], $this->ensureCorrectEncoding($recipientName));
                 $this->sendTheMail($recipient, $recipientRow);
             }
         }