Skip to content

Commit

Permalink
deindent
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Jan 8, 2020
1 parent dc68b3d commit f17e347
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
18 changes: 9 additions & 9 deletions src/Illuminate/Mail/resources/views/html/footer.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<tr>
<td>
<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) }}
</td>
</tr>
</table>
</td>
<td>
<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) }}
</td>
</tr>
</table>
</td>
</tr>
22 changes: 11 additions & 11 deletions src/Illuminate/Mail/resources/views/html/panel.blade.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<table class="panel" width="100%" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td class="panel-content">
<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td class="panel-item">
{{ Illuminate\Mail\Markdown::parse($slot) }}
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="panel-content">
<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td class="panel-item">
{{ Illuminate\Mail\Markdown::parse($slot) }}
</td>
</tr>
</table>
</td>
</tr>
</table>
10 changes: 5 additions & 5 deletions src/Illuminate/Mail/resources/views/html/subcopy.blade.php
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) }}
</td>
</tr>
<tr>
<td>
{{ Illuminate\Mail\Markdown::parse($slot) }}
</td>
</tr>
</table>

11 comments on commit f17e347

@Assimilationstheorie
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? 🌵

@telkins
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? 🌵

Exactly....Why...?

@driesvints
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were some issues after we switched to CommonMark. We decided to remove the indentation here because the indentation was re-parsed sometimes for inherited views after being parsed by Markdown.

For more info see #31065

@telkins
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were some issues after we switched to CommonMark. We decided to remove the indentation here because the indentation was re-parsed sometimes for inherited views after being parsed by Markdown.

For more info see #31065

Thx for the info. Is it fair to say that this is not so much a fix of the problem as it is treating a symptom...? (Not saying it should/shouldn't be done....I'm just thinking that there may be problems going forward with "unindented" markup.)

@driesvints
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@telkins we can't revert the PR because we had to switch parsers because the previous parser had an XSS vulnerability. Let's just see if any problems arise.

@AntoineAugusti
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @driesvints,

I'm reporting an issue.

Previously, I exported the default template. After upgrading to Laravel 7, the panel component spits outs HTML in the email
image

@GrahamCampbell
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please clear your view cache.

@driesvints
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And did you republish the mail templates?

@GrahamCampbell
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And if you exported them, you'll need to-export them and re-apply your changes.

@AntoineAugusti
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleared my view cache - nothing changes. The fix is to remove indentation or republish and apply changes. Really not ideal in my opinion.

@juliomotol
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AntoineAugusti add the --force option.

#31065 (comment)

I realized my issue was I had published the vendor files to customize the blade templates.

php artisan vendor:publish --tag=laravel-mail --force worked for me.

Of course, if you made any modifications to the blade templates you'll have to redo them.

Please sign in to comment.