Skip to content

Commit 701d6d0

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Capitalise From and Bcc header names in global mailer configuration
2 parents 8013741 + 4af4c36 commit 701d6d0

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
@@ -492,8 +492,8 @@ and headers.
492492
sender: 'fabien@example.com'
493493
recipients: ['foo@example.com', 'bar@example.com']
494494
headers:
495-
from: 'Fabien <fabien@example.com>'
496-
bcc: 'baz@example.com'
495+
From: 'Fabien <fabien@example.com>'
496+
Bcc: 'baz@example.com'
497497
X-Custom-Header: 'foobar'
498498
499499
.. code-block:: xml
@@ -515,8 +515,8 @@ and headers.
515515
<framework:recipients>foo@example.com</framework:recipients>
516516
<framework:recipients>bar@example.com</framework:recipients>
517517
</framework:envelope>
518-
<framework:header name="from">Fabien &lt;fabien@example.com&gt;</framework:header>
519-
<framework:header name="bcc">baz@example.com</framework:header>
518+
<framework:header name="From">Fabien &lt;fabien@example.com&gt;</framework:header>
519+
<framework:header name="Bcc">baz@example.com</framework:header>
520520
<framework:header name="X-Custom-Header">foobar</framework:header>
521521
</framework:mailer>
522522
</framework:config>
@@ -535,8 +535,8 @@ and headers.
535535
->recipients(['foo@example.com', 'bar@example.com'])
536536
;
537537
538-
$mailer->header('from')->value('Fabien <fabien@example.com>');
539-
$mailer->header('bcc')->value('baz@example.com');
538+
$mailer->header('From')->value('Fabien <fabien@example.com>');
539+
$mailer->header('Bcc')->value('baz@example.com');
540540
$mailer->header('X-Custom-Header')->value('foobar');
541541
};
542542

0 commit comments

Comments
 (0)