Skip to content

Commit

Permalink
Fixed #14061
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Dec 21, 2023
1 parent c5ed486 commit 2c6201f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions src/fields/Matrix.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'] === '') {
Expand Down

0 comments on commit 2c6201f

Please sign in to comment.