Skip to content
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

Jump to bottom

[5.4] Check Htmlable contract instead of instanceof HtmlString in Mailer #18459

Merged
merged 2 commits into from
Mar 23, 2017
Merged

[5.4] Check Htmlable contract instead of instanceof HtmlString in Mailer #18459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d04c9
Check Htmlable contract instead of instanceof HtmlString in Mailer
jbraud Mar 23, 2017
721f0f9
Update Mailer.php
taylorotwell Mar 23, 2017
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
4 changes: 2 additions & 2 deletions src/Illuminate/Mail/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
use Swift_Message;
use Illuminate\Support\Arr;
use InvalidArgumentException;
use Illuminate\Support\HtmlString;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Contracts\Mail\Mailer as MailerContract;
Expand Down Expand Up @@ -294,7 +294,7 @@ protected function addContent($message, $view, $plain, $raw, $data)
*/
protected function renderView($view, $data)
{
return $view instanceof HtmlString
return $view instanceof Htmlable
? $view->toHtml()
: $this->views->make($view, $data)->render();
}
Expand Down