Skip to content
Merged

5.0.2 #7388

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 41 additions & 32 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,63 +1,72 @@
## Description
<!--
A clear and concise description of the PR.
Use this section for review hints, explanations or discussion points/todos.
<!--
Add info about why this PR exists and the decisions that went into it.
This info is meant for the reviewer of this PR.

You may keep it short or omit it if it's a simple PR. Please add more
context and a summary of changes if it's a more complex PR.

Make sure to point your PR to the relevant develop branches, e.g.
`develop-patch`, `develop-minor` or `v5/develop`
`develop-patch`, `develop-minor` or `v6/develop`.

How to contribute: https://contribute.getkirby.com
-->

### Summary of changes



### Reasoning



### Additional context

## Changelog
<!--
Add relevant release notes. Keep the target audience (Kirby user) in mind.
Reference issues from the `kirby` repo or ideas from `feedback.getkirby.com`.
-->

### 🎉 Features
<!--
e.g. New feature X which helps users to …
-->

## Changelog
<!--
Add relevant release notes: Features, Enhancements, Fixes, Deprecated.
Reference issues from the `kirby` repo or ideas from `feedback.getkirby.com`.
Always mention whether your PR introduces breaking changes.
### ✨ Enhancements
<!--
e.g. Improve a11y of feature X
-->

### Fixes
### 🐛 Bug fixes
<!--
e.g. Fix broken feature X. See issue #123
-->

### ♻️ Refactored
<!--
e.g. Rename method X to method Y.
-->

### ☠️ Deprecated
<!--
e.g. Deprecate method X. Use method Y instead.
-->

### Breaking changes
### 🧹 Housekeeping
<!--
e.g. Update JS dependencies
-->

### 🚨 Breaking changes
<!--
e.g. Method X has been removed
-->


## Docs
<!--
Add any notes that help to document the feature/changes. Doesn't need
to be your best writing, just a few words and/or code snippets.
If applicable, add links to existing docs pages where the docs can be placed.
-->



## Ready?
<!--
If you can help to check off the following tasks, that'd be great.
If not, don't worry - we will take care of it.
-->

- [ ] In-code documentation (wherever needed)
- [ ] Unit tests for fixed bug/feature
- [ ] Tests and CI checks all pass

### For review team
<!--
We will take care of the following before merging the PR.
-->

- [ ] Add lab and/or sandbox examples (wherever helpful)
- [ ] Add changes & docs to release notes draft in Notion
- [ ] Add changes & docs to release notes draft in Notion
4 changes: 2 additions & 2 deletions cacert.pem
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
## Bundle of CA Root Certificates
##
## Certificate data from Mozilla as of: Tue May 20 03:12:02 2025 GMT
## Certificate data from Mozilla as of: Tue Jul 15 03:12:01 2025 GMT
##
## Find updated versions here: https://curl.se/docs/caextract.html
##
Expand All @@ -16,7 +16,7 @@
## Just configure this file as the SSLCACertificateFile.
##
## Conversion done with mk-ca-bundle.pl version 1.29.
## SHA256: 8944ec6b572b577daee4fc681a425881f841ec2660e4cb5f0eee727f84620697
## SHA256: 579f336ace2e5717b8ecc06002ce0cce96f70623d188e1999c34b0f77696d3e9
##


Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Kirby core",
"license": "proprietary",
"type": "kirby-cms",
"version": "5.0.1",
"version": "5.0.2",
"keywords": [
"kirby",
"cms",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions config/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ function uuid(): string

if (Helpers::hasOverride('video') === false) { // @codeCoverageIgnore
/**
* Creates a video embed via iframe for Youtube or Vimeo
* Creates a video embed via iframe for YouTube or Vimeo
* videos. The embed Urls are automatically detected from
* the given Url.
*/
Expand Down Expand Up @@ -680,7 +680,7 @@ function widont(string|null $string = null): string

if (Helpers::hasOverride('youtube') === false) { // @codeCoverageIgnore
/**
* Embeds a Youtube video by URL in an iframe
* Embeds a YouTube video by URL in an iframe
*/
function youtube(
string $url,
Expand Down
2 changes: 2 additions & 0 deletions panel/dist/js/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import Vue, {
onUpdated,
provide,
proxyRefs,
reactive,
readonly,
ref,
shallowReactive,
Expand Down Expand Up @@ -86,6 +87,7 @@ Object.assign(Vue, {
onUpdated,
provide,
proxyRefs,
reactive,
readonly,
ref,
shallowReactive,
Expand Down
2 changes: 1 addition & 1 deletion panel/dist/js/vendor.min.js

Large diffs are not rendered by default.

45 changes: 29 additions & 16 deletions panel/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"prosemirror-history": "^1.4.1",
"prosemirror-inputrules": "^1.5.0",
"prosemirror-keymap": "^1.2.3",
"prosemirror-model": "^1.25.1",
"prosemirror-model": "^1.25.2",
"prosemirror-schema-list": "^1.5.1",
"prosemirror-view": "^1.40.0",
"sortablejs": "^1.15.6",
Expand All @@ -28,7 +28,7 @@
"devDependencies": {
"@csstools/postcss-light-dark-function": "^2.0.9",
"@vitejs/plugin-vue2": "^2.3.3",
"eslint": "^9.30.1",
"eslint": "^9.31.0",
"eslint-config-prettier": "^10.1.5",
"eslint-plugin-vue": "^9.33.0",
"glob": "^11.0.3",
Expand Down
2 changes: 2 additions & 0 deletions panel/public/js/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import Vue, {
onUpdated,
provide,
proxyRefs,
reactive,
readonly,
ref,
shallowReactive,
Expand Down Expand Up @@ -86,6 +87,7 @@ Object.assign(Vue, {
onUpdated,
provide,
proxyRefs,
reactive,
readonly,
ref,
shallowReactive,
Expand Down
4 changes: 0 additions & 4 deletions src/Form/Mixin/Value.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@ public function isSubmittable(Language $language): bool
return false;
}

if ($this->isActive() === false) {
return false;
}

return true;
}

Expand Down
40 changes: 39 additions & 1 deletion tests/Form/FieldClassTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,45 @@ public function testIsSubmittableWithWhenQueryAndNonMatchingValue()
],
]);

$this->assertFalse($field->isSubmittable($language));
$this->assertTrue($field->isSubmittable($language));
}

public function testIsSubmittableWithWhenQueryAndTwoFields()
{
$language = Language::ensure('current');

$fields = new Fields([
new TestField([
'name' => 'a',
'value' => 'a',
'when' => [
'b' => 'b'
]
]),
new TestField([
'name' => 'b',
'value' => 'b',
'when' => [
'a' => 'a'
]
]),
]);

$a = $fields->get('a');
$b = $fields->get('b');

$this->assertTrue($a->isSubmittable($language));
$this->assertTrue($b->isSubmittable($language));

$fields->submit([
'a' => 'a submitted',
'b' => 'b submitted'
]);

$this->assertSame([
'a' => 'a submitted',
'b' => 'b submitted'
], $fields->toFormValues());
}

/**
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php return array(
'root' => array(
'name' => 'getkirby/cms',
'pretty_version' => '5.0.1',
'version' => '5.0.1.0',
'pretty_version' => '5.0.2',
'version' => '5.0.2.0',
'reference' => null,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand Down Expand Up @@ -47,8 +47,8 @@
'dev_requirement' => false,
),
'getkirby/cms' => array(
'pretty_version' => '5.0.1',
'version' => '5.0.1.0',
'pretty_version' => '5.0.2',
'version' => '5.0.2.0',
'reference' => null,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand Down
Loading