Upgrade to 4.4.1

This commit is contained in:
Bastian Allgeier
2024-09-23 11:46:43 +02:00
parent 8bc7250b68
commit 49287c7a5e
8 changed files with 30 additions and 42 deletions

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.4.0", "version": "4.4.1",
"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": "a49870b845c1d596a44c5af23c4dd685", "content-hash": "e180b005ee9eb7164de462164b71a337",
"packages": [ "packages": [
{ {
"name": "christian-riesen/base32", "name": "christian-riesen/base32",

View File

@@ -70,12 +70,19 @@ return [
'action' => function () { 'action' => function () {
$kirby = App::instance(); $kirby = App::instance();
$request = $kirby->request(); $request = $kirby->request();
$root = $request->get('root');
$page = $kirby->page($request->get('page')); $page = $kirby->page($request->get('page'));
$parents = $page?->parents()->flip()->values(
fn ($parent) => $parent->uuid()?->toString() ?? $parent->id()
) ?? [];
// if root is included, add the site as top-level parent
if ($root === 'true') {
array_unshift($parents, $kirby->site()->uuid()?->toString() ?? '/');
}
return [ return [
'data' => $page->parents()->flip()->values( 'data' => $parents
fn ($parent) => $parent->uuid()?->toString() ?? $parent->id()
)
]; ];
} }
] ]

View File

@@ -126,12 +126,12 @@
"error.form.notSaved": "항목을 저장할 수 없습니다.", "error.form.notSaved": "항목을 저장할 수 없습니다.",
"error.language.code": "올바른 언어 코드를 입력하세요.", "error.language.code": "올바른 언어 코드를 입력하세요.",
"error.language.create.permission": "You are not allowed to create a language", "error.language.create.permission": "언어를 등록할 권한이 없습니다.",
"error.language.delete.permission": "You are not allowed to delete the language", "error.language.delete.permission": "언어를 삭제할 권한이 없습니다.",
"error.language.duplicate": "이미 등록한 언어입니다.", "error.language.duplicate": "이미 등록한 언어입니다.",
"error.language.name": "올바른 언어명을 입력하세요.", "error.language.name": "올바른 언어명을 입력하세요.",
"error.language.notFound": "언어를 찾을 수 없습니다.", "error.language.notFound": "언어를 찾을 수 없습니다.",
"error.language.update.permission": "You are not allowed to update the language", "error.language.update.permission": "언어를 변경할 권한이 없습니다.",
"error.layout.validation.block": "레이아웃({layoutIndex})의 특정 블록 유형({fieldset})을 사용하는 블록({blockIndex})의 특정 필드({field})에 오류가 있습니다.", "error.layout.validation.block": "레이아웃({layoutIndex})의 특정 블록 유형({fieldset})을 사용하는 블록({blockIndex})의 특정 필드({field})에 오류가 있습니다.",
"error.layout.validation.settings": "레이아웃({index}) 옵션을 확인하세요.", "error.layout.validation.settings": "레이아웃({index}) 옵션을 확인하세요.",
@@ -620,8 +620,8 @@
"stats.empty": "관련 기록이 없습니다.", "stats.empty": "관련 기록이 없습니다.",
"status": "상태", "status": "상태",
"system.info.copy": "Copy info", "system.info.copy": "정보 복사",
"system.info.copied": "System info copied", "system.info.copied": "시스템 정보가 복사되었습니다.",
"system.issues.content": "<code>/content</code> 폴더의 권한을 확인하세요.", "system.issues.content": "<code>/content</code> 폴더의 권한을 확인하세요.",
"system.issues.eol.kirby": "설치된 Kirby 버전이 만료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.", "system.issues.eol.kirby": "설치된 Kirby 버전이 만료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.",
"system.issues.eol.plugin": "설치된 플러그인({plugin}의 지원이 종료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.", "system.issues.eol.plugin": "설치된 플러그인({plugin}의 지원이 종료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.",

File diff suppressed because one or more lines are too long

View File

@@ -3,7 +3,6 @@
namespace Kirby\Cms; namespace Kirby\Cms;
use Kirby\Filesystem\F; use Kirby\Filesystem\F;
use Kirby\Toolkit\Str;
class LanguageRoutes class LanguageRoutes
{ {
@@ -30,26 +29,9 @@ class LanguageRoutes
'pattern' => $language->pattern(), 'pattern' => $language->pattern(),
'method' => 'ALL', 'method' => 'ALL',
'env' => 'site', 'env' => 'site',
'action' => function ($path = null) use ($kirby, $language) { 'action' => function ($path = null) use ($language) {
$result = $language->router()->call($path); $result = $language->router()->call($path);
// redirect secondary-language pages that have
// been accessed with non-translated slugs in their path
// to their fully translated URL
if ($path !== null && $result instanceof Page) {
if (Str::endsWith($result->url(), $path) === false) {
$url = $result->url();
$query = $kirby->request()->query()->toString();
// preserve query across redirect
if (empty($query) === false) {
$url .= '?' . $query;
}
return $kirby->response()->redirect($url);
}
}
// explicitly test for null as $result can // explicitly test for null as $result can
// contain falsy values that should still be returned // contain falsy values that should still be returned
if ($result !== null) { if ($result !== null) {

View File

@@ -2,7 +2,6 @@
namespace Kirby\Filesystem; namespace Kirby\Filesystem;
use Kirby\Cms\App;
use Kirby\Cms\Language; use Kirby\Cms\Language;
use Kirby\Toolkit\Str; use Kirby\Toolkit\Str;
@@ -49,7 +48,8 @@ class Filename
public function __construct( public function __construct(
protected string $filename, protected string $filename,
protected string $template, protected string $template,
protected array $attributes = [] protected array $attributes = [],
protected string|null $language = null
) { ) {
$this->name = $this->sanitizeName($filename); $this->name = $this->sanitizeName($filename);
$this->extension = $this->sanitizeExtension( $this->extension = $this->sanitizeExtension(
@@ -234,13 +234,12 @@ class Filename
{ {
// temporarily store language rules // temporarily store language rules
$rules = Str::$language; $rules = Str::$language;
$kirby = App::instance(null, true);
// if current user, add rules for their language to `Str` class // add rules for a particular language to `Str` class
if ($user = $kirby?->user()) { if ($this->language !== null) {
Str::$language = [ Str::$language = [
...Str::$language, ...Str::$language,
...Language::loadRules($user->language())]; ...Language::loadRules($this->language)];
} }
// sanitize name // sanitize name

View File

@@ -1,9 +1,9 @@
<?php return array( <?php return array(
'root' => array( 'root' => array(
'name' => 'getkirby/cms', 'name' => 'getkirby/cms',
'pretty_version' => '4.4.0', 'pretty_version' => '4.4.1',
'version' => '4.4.0.0', 'version' => '4.4.1.0',
'reference' => NULL, 'reference' => null,
'type' => 'kirby-cms', 'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
@@ -47,9 +47,9 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'getkirby/cms' => array( 'getkirby/cms' => array(
'pretty_version' => '4.4.0', 'pretty_version' => '4.4.1',
'version' => '4.4.0.0', 'version' => '4.4.1.0',
'reference' => NULL, 'reference' => null,
'type' => 'kirby-cms', 'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),