Skip to content

Commit fa530d3

Browse files
committed
[BUGFIX] Ensure further variable fallback checks in EXT:felogin
With #106942 changes were made to prevent PHP type errors / exceptions in case the EXT:felogin TypoScript was not included. Two spots were missed, which is addressed by this patch. Resolves: #106994 Related: #106942 Releases: main, 13.4 Change-Id: I4da4c91ba96e40cffd028f9a8503c527b09efc8f Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/89930 Tested-by: core-ci <typo3@b13.com> Tested-by: Torben Hansen <derhansen@gmail.com> Reviewed-by: Garvin Hicking <garvin@hick.ing> Tested-by: Oli Bartsch <bo@cedev.de> Tested-by: Garvin Hicking <garvin@hick.ing> Reviewed-by: Oli Bartsch <bo@cedev.de> Reviewed-by: Torben Hansen <derhansen@gmail.com>
1 parent 03771cc commit fa530d3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

typo3/sysext/felogin/Classes/Configuration/RecoveryConfiguration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ protected function resolveFromTypoScript(): void
155155
);
156156
}
157157
}
158-
$this->mailTemplateName = (string)$this->settings['email']['templateName'];
158+
$this->mailTemplateName = (string)($this->settings['email']['templateName'] ?? '');
159159
if (empty($this->mailTemplateName)) {
160160
throw new IncompleteConfigurationException(
161-
'Key "plugin.tx_felogin_login.settings.email.templateName" cannot be empty!',
161+
'Key "plugin.tx_felogin_login.settings.email.templateName" cannot be empty! Ensure that TypoScript is properly included.',
162162
1584998393
163163
);
164164
}

typo3/sysext/felogin/Classes/Service/RecoveryService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected function prepareMail(RequestInterface $request, Address $receiver, str
101101
'receiverName' => $receiver->getName(),
102102
'userData' => $userData,
103103
'url' => $url,
104-
'validUntil' => date($this->settings['dateFormat'], $this->recoveryConfiguration->getLifeTimeTimestamp()),
104+
'validUntil' => date($this->settings['dateFormat'] ?? 'Y-m-d H:i', $this->recoveryConfiguration->getLifeTimeTimestamp()),
105105
];
106106

107107
$mailTemplatePaths = $this->recoveryConfiguration->getMailTemplatePaths();

0 commit comments

Comments
 (0)