Upgrade to 3.5.5

This commit is contained in:
Bastian Allgeier
2021-05-11 11:55:32 +02:00
parent de3560f3d6
commit efeff45192
146 changed files with 2008 additions and 1075 deletions

View File

@@ -56,12 +56,12 @@ class EmailChallenge extends Challenge
$kirby = $user->kirby();
$kirby->email([
'from' => $kirby->option('auth.challenge.email.from', 'noreply@' . $kirby->system()->indexUrl()),
'from' => $kirby->option('auth.challenge.email.from', 'noreply@' . $kirby->url('index', true)->host()),
'fromName' => $kirby->option('auth.challenge.email.fromName', $kirby->site()->title()),
'to' => $user,
'subject' => $kirby->option(
'auth.challenge.email.subject',
I18n::translate('login.email.' . $mode . '.subject')
I18n::translate('login.email.' . $mode . '.subject', null, $user->language())
),
'template' => 'auth/' . $mode,
'data' => [

View File

@@ -153,7 +153,7 @@ class Status
* Sets the type of the active challenge
*
* @param string|null $challenge
* @return self
* @return $this
*/
protected function setChallenge(?string $challenge = null)
{
@@ -166,7 +166,7 @@ class Status
* a fallback when $challenge is `null`
*
* @param string|null $challengeFallback
* @return self
* @return $this
*/
protected function setChallengeFallback(?string $challengeFallback = null)
{
@@ -178,7 +178,7 @@ class Status
* Sets the email address of the current/pending user
*
* @param string|null $email
* @return self
* @return $this
*/
protected function setEmail(?string $email = null)
{
@@ -190,7 +190,7 @@ class Status
* Sets the Kirby instance for user lookup
*
* @param \Kirby\Cms\App $kirby
* @return self
* @return $this
*/
protected function setKirby(App $kirby)
{
@@ -202,7 +202,7 @@ class Status
* Sets the authentication status
*
* @param string $status `active|impersonated|pending|inactive`
* @return self
* @return $this
*/
protected function setStatus(string $status)
{