Skip to content

Commit

Permalink
[5.4] Fix regression on queueable mailables (#18160)
Browse files Browse the repository at this point in the history
Refs: #18144

This fixes the infinite recursion the was happening. I have tested on
my local machine and looks good.

@tomcoonen Can you have a look at this?
  • Loading branch information
KennedyTedesco authored and taylorotwell committed Feb 28, 2017
1 parent 717f1f6 commit 7451096
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Illuminate/Mail/Mailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ public function send($view, array $data = [], $callback = null)
* Send the given mailable.
*
* @param MailableContract $mailable
* @return void
* @return mixed
*/
protected function sendMailable($mailable)
protected function sendMailable(MailableContract $mailable)
{
return $mailable instanceof ShouldQueue
? $mailable->queue($this->queue) : $mailable->send($this);
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/SendQueuedMailable.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function __construct(MailableContract $mailable)
*/
public function handle(MailerContract $mailer)
{
$mailer->send($this->mailable);
$this->mailable->send($mailer);
}

/**
Expand Down

0 comments on commit 7451096

Please sign in to comment.