interkollektives/lichterei-web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.6.1

Browse Source
This commit is contained in:
Bastian Allgeier
2021-12-07 12:39:37 +01:00
parent 9fc43ea22c
commit 70b8439c49
134 changed files with 19987 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kirby/src/Cms/User.php
View File

@@ -228,7 +228,7 @@ class User extends ModelWithContent
protected function credentials(): array
{
return $this->credentials = $this->credentials ?? $this->readCredentials();
return $this->credentials ??= $this->readCredentials();
}
/**
@@ -238,7 +238,7 @@ class User extends ModelWithContent
*/
public function email(): ?string
{
return $this->email = $this->email ?? $this->credentials()['email'] ?? null;
return $this->email ??= $this->credentials()['email'] ?? null;
}
/**
@@ -403,7 +403,7 @@ class User extends ModelWithContent
*/
public function language(): string
{
return $this->language ?? $this->language = $this->credentials()['language'] ?? $this->kirby()->panelLanguage();
return $this->language ??= $this->credentials()['language'] ?? $this->kirby()->panelLanguage();
}
/**
@@ -530,9 +530,9 @@ class User extends ModelWithContent
$modifiedContent = F::modified($this->contentFile($languageCode));
$modifiedIndex = F::modified($this->root() . '/index.php');
$modifiedTotal = max([$modifiedContent, $modifiedIndex]);
$handler = $handler ?? $this->kirby()->option('date.handler', 'date');
$handler ??= $this->kirby()->option('date.handler', 'date');
return $handler($format, $modifiedTotal);
return Str::date($modifiedTotal, $format, $handler);
}
/**