Merge branch '4.x' of https://github.com/craftcms/cms into 5.x

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Fixed a bug where multi-site elements’ search indexes could be updated twice.
 - Fixed a bug where some nested Matrix entries weren’t getting propagated to newly-added sites of their owners, if any blocks had been modified. ([#16640](https://github.com/craftcms/cms/issues/16640))
 - Fixed an error that could occur when deleting a draft.
+- Fixed an error that could occur when saving a Structure section entry, if it had an Assets field with a dynamic subpath that referenced `level`. ([#16661](https://github.com/craftcms/cms/pull/16661))
 - Fixed a bug where Number fields weren’t getting sorted properly in PostgreSQL. ([#15828](https://github.com/craftcms/cms/issues/15828))
 - Fixed a bug where Matrix fields’ “Default View Mode” settings included a “Display in a structured table” option. ([#16631](https://github.com/craftcms/cms/discussions/16631))
 - Fixed a bug where user addresses weren’t getting restored when soft-deleted users were restored. ([#16636](https://github.com/craftcms/cms/pull/16636))

src/fields/Assets.php

@@ -924,7 +924,7 @@ private function _findFolder(string $sourceKey, ?string $subpath, ?ElementInterf
             // Prepare the path by parsing tokens and normalizing slashes.
             try {
                 if ($element?->duplicateOf) {
-                    $element = $element->duplicateOf;
+                    $element = $element->duplicateOf->getCanonical();
                 }
                 $renderedSubpath = Craft::$app->getView()->renderObjectTemplate($subpath, $element);
             } catch (InvalidConfigException|RuntimeError $e) {