8000 [11.x] Fix `Illuminate\Support\EncodedHtmlString` from causing breaking change by crynobone · Pull Request #55149 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

[11.x] Fix Illuminate\Support\EncodedHtmlString from causing breaking change #55149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 24, 2025
Merged

[11.x] Fix Illuminate\Support\EncodedHtmlString from causing breaking change #55149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
758dfc5
wip
crynobone Mar 23, 2025
b273d79
wip
crynobone Mar 24, 2025
a6e26ef
wip
crynobone Mar 24, 2025
e38266f
wip
crynobone Mar 24, 2025
cec5942
wip
crynobone Mar 24, 2025
fd0d9fa
wip
crynobone Mar 24, 2025
aa53a49
wip
crynobone Mar 24, 2025
bcbdea0
Update src/Illuminate/Mail/Markdown.php
crynobone Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
wip 
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
  • Loading branch information
@crynobone
crynobone committed Mar 23, 2025
commit 758dfc54965a668417c204e867b205aff37012e9
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/resources/views/html/button.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<table border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<a href="{{ $url }}" class="button button-{{ $color }}" target="_blank" rel="noopener">{{ $slot }}</a>
<a href="{{ $url }}" class="button button-{{ $color }}" target="_blank" rel="noopener">{!! $slot !!}</a>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/resources/views/html/footer.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<table class="footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td class="content-cell" align="center">
{{ Illuminate\Mail\Markdown::parse($slot) }}
{!! Illuminate\Mail\Markdown::parse($slot) !!}
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/resources/views/html/header.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@if (trim($slot) === 'Laravel')
<img src="https://laravel.com/img/notification-logo.png" class="logo" alt="Laravel Logo">
@else
{{ $slot }}
{!! $slot !!}
@endif
</a>
</td>
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Mail/resources/views/html/layout.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<tr>
<td align="center">
<table class="content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
{{ $header ?? '' }}
{!! $header ?? '' !!}

<!-- Email Body -->
<tr>
Expand All @@ -40,16 +40,16 @@
<!-- Body content -->
<tr>
<td class="content-cell">
{{ Illuminate\Mail\Markdown::parse($slot) }}
{!! Illuminate\Mail\Markdown::parse($slot) !!}

{{ $subcopy ?? '' }}
{!! $subcopy ?? '' !!}
</td>
</tr>
</table>
</td>
</tr>

{{ $footer ?? '' }}
{!! $footer ?? '' !!}
</table>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Mail/resources/views/html/message.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</x-slot:header>

{{-- Body --}}
{{ $slot }}
{!! $slot !!}

{{-- Subcopy --}}
@isset($subcopy)
<x-slot:subcopy>
<x-mail::subcopy>
{{ $subcopy }}
{!! $subcopy !!}
</x-mail::subcopy>
</x-slot:subcopy>
@endisset
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/resources/views/html/panel.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td class="panel-item">
{{ Illuminate\Mail\Markdown::parse($slot) }}
{!! Illuminate\Mail\Markdown::parse($slot) !!}
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/resources/views/html/subcopy.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<table class="subcopy" width="100%" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
{{ Illuminate\Mail\Markdown::parse($slot) }}
{!! Illuminate\Mail\Markdown::parse($slot) !!}
</td>
</tr>
</table>
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/resources/views/html/table.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="table">
{{ Illuminate\Mail\Markdown::parse($slot) }}
{!! Illuminate\Mail\Markdown::parse($slot) !!}
</div>
0