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

Upgrade to 4.1.2

Browse Source
This commit is contained in:
Bastian Allgeier
2024-03-06 12:42:16 +01:00
parent 2e8aa1ed80
commit 77d9337371
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kirby/config/helpers.php
View File

@@ -109,7 +109,7 @@ if (Helpers::hasOverride('deprecated') === false) { // @codeCoverageIgnore
}
}
if (Helpers::hasOverride('dump') === false) { // @codeCoverageIgnore
if (Helpers::hasOverride('dump') === false && function_exists('dump') === false) { // @codeCoverageIgnore
/**
* Simple object and variable dumper
* to help with debugging.

7
kirby/config/methods.php
View File

@@ -148,7 +148,7 @@ return function (App $app) {
$files = new Files([]);
foreach ($field->toData($separator) as $id) {
if ($file = $parent->kirby()->file($id, $parent)) {
if (is_string($id) === true && $file = $parent->kirby()->file($id, $parent)) {
$files->add($file);
}
}
@@ -481,10 +481,9 @@ return function (App $app) {
foreach ($elements as $element) {
foreach ($attributes as $attribute) {
if ($element->hasAttribute($attribute) && $url = $element->getAttribute($attribute)) {
if ($element->hasAttribute($attribute) && $uuid = $element->getAttribute($attribute)) {
try {
if ($uuid = Uuid::for($url)) {
$url = $uuid->model()?->url();
if ($url = Uuid::for($uuid)?->model()?->url()) {
$element->setAttribute($attribute, $url);
}
} catch (InvalidArgumentException) {