hocusfokus/hocusfokus-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.8.0

Browse Source
This commit is contained in:
Bastian Allgeier
2022-10-06 10:11:54 +02:00
parent a9ed4e45ca
commit 7d168aae58
332 changed files with 26337 additions and 21977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kirby/src/Cms/Language.php
View File

@@ -350,7 +350,7 @@ class Language extends Model
try {
return Data::read($file);
} catch (\Exception $e) {
} catch (\Exception) {
return [];
}
}
@@ -365,9 +365,9 @@ class Language extends Model
{
if ($category !== null) {
return $this->locale[$category] ?? $this->locale[LC_ALL] ?? null;
} else {
return $this->locale;
}
return $this->locale;
}
/**
@@ -456,7 +456,7 @@ class Language extends Model
{
try {
$existingData = Data::read($this->root());
} catch (Throwable $e) {
} catch (Throwable) {
$existingData = [];
}
@@ -662,9 +662,7 @@ class Language extends Model
// convert the current default to a non-default language
if ($updated->isDefault() === true) {
if ($oldDefault = $kirby->defaultLanguage()) {
$oldDefault->clone(['default' => false])->save();
}
$kirby->defaultLanguage()?->clone(['default' => false])->save();
$code = $this->code();
$site = $kirby->site();