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/composer.json
View File

@@ -3,7 +3,7 @@
"description": "The Kirby core", "description": "The Kirby core",
"license": "proprietary", "license": "proprietary",
"type": "kirby-cms", "type": "kirby-cms",
"version": "4.1.1", "version": "4.1.2",
"keywords": [ "keywords": [
"kirby", "kirby",
"cms", "cms",

2
kirby/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "198d5d56dcbb8ba4ff42a1cb4a2630bc", "content-hash": "91cceb6b0d22bbcb152456ab27e0fdbb",
"packages": [ "packages": [
{ {
"name": "christian-riesen/base32", "name": "christian-riesen/base32",

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 * Simple object and variable dumper
* to help with debugging. * to help with debugging.

7
kirby/config/methods.php
View File

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

2
kirby/panel/dist/css/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
kirby/panel/dist/js/index.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
kirby/src/Http/Remote.php
View File

@@ -59,7 +59,9 @@ class Remote
// use the system CA store by default if // use the system CA store by default if
// one has been configured in php.ini // one has been configured in php.ini
$cainfo = ini_get('curl.cainfo'); $cainfo = ini_get('curl.cainfo');
if (empty($cainfo) === false && is_file($cainfo) === true) {
// Suppress warnings e.g. if system CA is outside of open_basedir (See: issue #6236)
if (empty($cainfo) === false && @is_file($cainfo) === true) {
$defaults['ca'] = self::CA_SYSTEM; $defaults['ca'] = self::CA_SYSTEM;
} }

8
kirby/vendor/composer/installed.php vendored
View File

@@ -1,8 +1,8 @@
<?php return array( <?php return array(
'root' => array( 'root' => array(
'name' => 'getkirby/cms', 'name' => 'getkirby/cms',
'pretty_version' => '4.1.1', 'pretty_version' => '4.1.2',
'version' => '4.1.1.0', 'version' => '4.1.2.0',
'reference' => null, 'reference' => null,
'type' => 'kirby-cms', 'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
@@ -47,8 +47,8 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'getkirby/cms' => array( 'getkirby/cms' => array(
'pretty_version' => '4.1.1', 'pretty_version' => '4.1.2',
'version' => '4.1.1.0', 'version' => '4.1.2.0',
'reference' => null, 'reference' => null,
'type' => 'kirby-cms', 'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',