Commit f1766832 authored by Oliver Bartsch's avatar Oliver Bartsch Committed by Christian Kuhn
Browse files

[BUGFIX] Set request for recovery email in EXT:felogin

Because the request was not set for the recovery email,
the TYPO3 logo as well as the website URL in the footer
were not displayed when using the SystemEmail layout
from core.

This is now fixed by setting the request, if available.

Resolves: #93055
Releases: master, 10.4
Change-Id: I005df28b16bddc9a6105f72e361a07c0b7d15532
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/67175

Tested-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent e4833fda
......@@ -18,6 +18,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\FrontendLogin\Service;
use Psr\EventDispatcher\EventDispatcherInterface;
use Psr\Http\Message\ServerRequestInterface;
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
use Symfony\Component\Mime\Address;
use Symfony\Component\Mime\Email;
......@@ -177,6 +178,10 @@ class RecoveryService implements RecoveryServiceInterface
$mail->addReplyTo($replyTo);
}
if (($GLOBALS['TYPO3_REQUEST'] ?? null) instanceof ServerRequestInterface) {
$mail->setRequest($GLOBALS['TYPO3_REQUEST']);
}
return $mail;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment