SendmailMailer: fixed $commandArgs handling after 0e236e4 [Closes #93]

nette · Sep 23, 2023 · 6a2ee30 · 6a2ee30
1 parent 90b6737
commit 6a2ee30
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/Mail/SendmailMailer.php b/src/Mail/SendmailMailer.php
@@ -17,7 +17,7 @@
  */
 class SendmailMailer implements Mailer
 {
-	public ?string $commandArgs = null;
+	public string $commandArgs = '';
 	private ?Signer $signer = null;
 
 
@@ -47,21 +47,19 @@ public function send(Message $mail): void
 			: $tmp->generateMessage();
 		$parts = explode(Message::EOL . Message::EOL, $data, 2);
 
+		$cmd = $this->commandArgs;
+		if ($from = $mail->getFrom()) {
+			$cmd .= ' -f' . key($from);
+		}
+
 		$args = [
 			(string) $mail->getEncodedHeader('To'),
 			(string) $mail->getEncodedHeader('Subject'),
 			$parts[1],
 			$parts[0],
+			$cmd,
 		];
 
-		if ($from = $mail->getFrom()) {
-			$args[] = '-f' . key($from);
-		}
-
-		if ($this->commandArgs) {
-			$args[] = $this->commandArgs;
-		}
-
 		$res = Nette\Utils\Callback::invokeSafe('mail', $args, function (string $message) use (&$info): void {
 			$info = ": $message";
 		});