Skip to content

Commit 4af4c36

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Capitalise From and Bcc header names in global mailer configuration
2 parents 21b70ed + c0787c7 commit 4af4c36

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

mailer.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,8 @@ and headers.
552552
sender: 'fabien@example.com'
553553
recipients: ['foo@example.com', 'bar@example.com']
554554
headers:
555-
from: 'Fabien <fabien@example.com>'
556-
bcc: 'baz@example.com'
555+
From: 'Fabien <fabien@example.com>'
556+
Bcc: 'baz@example.com'
557557
X-Custom-Header: 'foobar'
558558
559559
.. code-block:: xml
@@ -575,8 +575,8 @@ and headers.
575575
<framework:recipients>foo@example.com</framework:recipients>
576576
<framework:recipients>bar@example.com</framework:recipients>
577577
</framework:envelope>
578-
<framework:header name="from">Fabien &lt;fabien@example.com&gt;</framework:header>
579-
<framework:header name="bcc">baz@example.com</framework:header>
578+
<framework:header name="From">Fabien &lt;fabien@example.com&gt;</framework:header>
579+
<framework:header name="Bcc">baz@example.com</framework:header>
580580
<framework:header name="X-Custom-Header">foobar</framework:header>
581581
</framework:mailer>
582582
</framework:config>
@@ -595,8 +595,8 @@ and headers.
595595
->recipients(['foo@example.com', 'bar@example.com'])
596596
;
597597
598-
$mailer->header('from')->value('Fabien <fabien@example.com>');
599-
$mailer->header('bcc')->value('baz@example.com');
598+
$mailer->header('From')->value('Fabien <fabien@example.com>');
599+
$mailer->header('Bcc')->value('baz@example.com');
600600
$mailer->header('X-Custom-Header')->value('foobar');
601601
};
602602

0 commit comments

Comments
 (0)