Skip to content

Commit

Permalink
Merge branch '4.x' of https://github.com/craftcms/cms into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Dec 27, 2024
2 parents aecf225 + 0265805 commit 2349850
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Fixed a bug where custom fields were getting included in rendered field layout forms, even if their `getInputHtml()` method returned an empty string.
- Fixed a bug where the password input on the Set Password page wasn’t including the “Show” button.
- Fixed a SQL error that could occur if an element was saved with a title longer than 255 characters.
- Fixed errors that could occur when working with field layouts for element types that are no longer installed. ([#16352](https://github.com/craftcms/cms/issues/16352))
- Fixed an error that could occur when creating nested entries within Matrix fields. ([#16331](https://github.com/craftcms/cms/issues/16331))
- Fixed a bug where element index View menus could include a “Use defaults” button when no view customizations had been made.
- Fixed a bug where new entries’ slugs weren’t getting propagated to other sites, if their entry type had a dynamic title format. ([#16347](https://github.com/craftcms/cms/issues/16347))
Expand Down
5 changes: 4 additions & 1 deletion src/services/Fields.php
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,10 @@ private function _layouts(): MemoizableArray
{
if (!isset($this->_layouts)) {
if (Craft::$app->getIsInstalled()) {
$layoutConfigs = $this->_createLayoutQuery()->all();
$layoutConfigs = $this->_createLayoutQuery()->collect()
->filter(fn(array $config) => ComponentHelper::validateComponentClass($config['type'], ElementInterface::class))
->values()
->all();
} else {
$layoutConfigs = [];
}
Expand Down

0 comments on commit 2349850

Please sign in to comment.