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

Upgrade to 3.6.4

Browse Source
This commit is contained in:
Bastian Allgeier
2022-04-05 10:18:36 +02:00
parent 905981da5a
commit fee3f5253d
25 changed files with 1643 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kirby/config/blocks/gallery/gallery.yml
View File

@@ -5,6 +5,7 @@ fields:
images:
label: field.blocks.gallery.images.label
type: files
query: model.images
multiple: true
layout: cards
size: tiny

1
kirby/config/blocks/image/image.yml
View File

@@ -13,6 +13,7 @@ fields:
image:
label: field.blocks.image.name
type: files
query: model.images
multiple: false
image:
back: black

2
kirby/config/components.php
View File

@@ -168,7 +168,7 @@ return [
* @return \Kirby\Cms\Collection|bool
*/
'search' => function (App $kirby, Collection $collection, string $query = null, $params = []) {
if (empty(trim($query)) === true) {
if (empty(trim($query ?? '')) === true) {
return $collection->limit(0);
}

3
kirby/config/fields/text.php
View File

@@ -69,14 +69,13 @@ return [
return $value;
}
$value = trim($value);
$converter = $this->converters()[$this->converter()];
if (is_array($value) === true) {
return array_map($converter, $value);
}
return call_user_func($converter, $value);
return call_user_func($converter, trim($value ?? ''));
},
'converters' => function (): array {
return [

3
kirby/config/sections/fields.php
View File

@@ -12,7 +12,8 @@ return [
'form' => function () {
$fields = $this->fields;
$disabled = $this->model->permissions()->update() === false;
$content = $this->model->content()->toArray();
$lang = $this->model->kirby()->languageCode();
$content = $this->model->content($lang)->toArray();
if ($disabled === true) {
foreach ($fields as $key => $props) {

11
kirby/config/sections/mixins/headline.php
View File

@@ -6,9 +6,16 @@ return [
'props' => [
/**
* The headline for the section. This can be a simple string or a template with additional info from the parent page.
* @todo deprecate in 3.7
*/
'headline' => function ($headline = null) {
return I18n::translate($headline, $headline);
},
/**
* label is the new official replacement for headline
*/
'label' => function ($label = null) {
return I18n::translate($label, $label);
}
],
'computed' => [
@@ -17,6 +24,10 @@ return [
return $this->model()->toString($this->headline);
}
if ($this->label) {
return $this->model()->toString($this->label);
}
return ucfirst($this->name);
}
]