diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c5a416046a..62193b6b99f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Fixed an error that could occur when updating to Craft 5. ([#14067](https://github.com/craftcms/cms/issues/14067)) - Fixed a bug where various features weren’t working. ([#14062](https://github.com/craftcms/cms/pull/14062)) - Fixed a bug where Matrix and Addresses fields were overriding each others’ view states. ([#13976](https://github.com/craftcms/cms/pull/13976)) +- Fixed an error that could occur when updating to Craft 5, if any Matrix fields hadn’t been saved since before Craft 3.2. ([#14061](https://github.com/craftcms/cms/issues/14061)) ## 5.0.0-alpha.2 - 2023-12-15 diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php index 44e57cdd423..241530b2f7a 100644 --- a/src/fields/Matrix.php +++ b/src/fields/Matrix.php @@ -270,9 +270,9 @@ public function __construct($config = []) // Config normalization unset($config['contentTable']); - if (array_key_exists('localizeEntries', $config)) { - $config['propagationMethod'] = $config['localizeEntries'] ? 'none' : 'all'; - unset($config['localizeEntries']); + if (array_key_exists('localizeBlocks', $config)) { + $config['propagationMethod'] = $config['localizeBlocks'] ? 'none' : 'all'; + unset($config['localizeBlocks']); } if (isset($config['entryTypes']) && $config['entryTypes'] === '') {