Skip to content

Commit c59ca5a

Browse files
authored
[2.x] fix: reversed logic in notification template for body content (#4317)
* fix: reversed lofic in notification template for body content * also informational email templates * chore: update CHANGLOG
1 parent c79baf1 commit c59ca5a

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
- sidebar width by @imorland [#4312]
2121
- minor styling fixes by @imorland [#4315]
2222
- FA icon shift when using Kit by @imorland [#4304]
23+
- email notification and information templates not rendering named slot content by @imorland [#4317]
2324

2425
### Changed
2526

framework/core/views/email/html/information.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
</x-slot:header>
55

66
<x-slot:content>
7-
{{ $slot ?? $body ?? '' }}
7+
{!! $body ?? $slot ?? '' !!}
88
@if (isset($preview))
99
<div class="content-preview">
10-
{{ $preview }}
10+
{!! $preview !!}
1111
</div>
1212
@endif
1313
</x-slot:content>

framework/core/views/email/html/notification.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
</x-slot:header>
55

66
<x-slot:content>
7-
{{ $slot ?? $body ?? '' }}
7+
{!! $body ?? $slot ?? '' !!}
88
@if (isset($preview))
99
<div class="content-preview">
10-
{{ $preview }}
10+
{!! $preview !!}
1111
</div>
1212
@endif
1313
</x-slot:content>

framework/core/views/email/plain/information.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</x-slot:header>
55

66
<x-slot:content>
7-
{{ $slot ?? $body ?? '' }}
7+
{!! $body ?? $slot ?? '' !!}
88
</x-slot:content>
99

1010
<x-slot:footer>

framework/core/views/email/plain/notification.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</x-slot:header>
55

66
<x-slot:content>
7-
{{ $slot ?? $body ?? '' }}
7+
{!! $body ?? $slot ?? '' !!}
88
</x-slot:content>
99

1010
<x-slot:footer>

0 commit comments

Comments
 (0)