Skip to content

Commit

Permalink
Merge branch '4.14' into bugfix/16184-failed-jobs-and-queue-manager-p…
Browse files Browse the repository at this point in the history
…ermission
  • Loading branch information
brandonkelly committed Nov 28, 2024
2 parents 032614c + 2ca15b1 commit bcaea6a
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 4.x
- '4.14'
pull_request:
permissions:
contents: read
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Release notes for Craft CMS 4.14 (WIP)

## System
- Updated Twig to 3.15. ([#16207](https://github.com/craftcms/cms/discussions/16207))
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes for Craft CMS 4

## Unreleased

- Fixed an error that could occur when duplicating an element with an Assets field that had a dynamic subpath. ([#16214](https://github.com/craftcms/cms/issues/16214))

## 4.13.3 - 2024-11-22

- Element indexes now sort by ID by default, for sources that don’t define a default sort option.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"symfony/var-dumper": "^5.0|^6.0",
"symfony/yaml": "^5.2.3",
"theiconic/name-parser": "^1.2",
"twig/twig": "~3.14.0",
"twig/twig": "~3.15.0",
"voku/stringy": "^6.4.0",
"webonyx/graphql-php": "~14.11.5",
"yiisoft/yii2": "~2.0.51.0",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

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

3 changes: 3 additions & 0 deletions src/fields/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,9 @@ private function _findFolder(string $sourceKey, ?string $subpath, ?ElementInterf
if ($isDynamic) {
// Prepare the path by parsing tokens and normalizing slashes.
try {
if ($element?->duplicateOf) {
$element = $element->duplicateOf;
}
$renderedSubpath = Craft::$app->getView()->renderObjectTemplate($subpath, $element);
} catch (InvalidConfigException|RuntimeError $e) {
throw new InvalidSubpathException($subpath, null, 0, $e);
Expand Down
1 change: 1 addition & 0 deletions src/web/twig/Extension.php
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ public function getTests(): array
/**
* @inheritdoc
*/
/** @phpstan-ignore-next-line */
public function getOperators(): array
{
return [
Expand Down

0 comments on commit bcaea6a

Please sign in to comment.