Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Jul 25, 2022
1 parent b2c1fe1 commit dfd2ff6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Fixed a bug where assets’ `getImg()` methods were returning `null` for assets in volumes without URLs, even if a transform was being used. ([#11614](https://github.com/craftcms/cms/issues/11614))
- Fixed a bug where sensitive data wasn’t getting redacted in the logs when Dev Mode was enabled. ([#11618](https://github.com/craftcms/cms/issues/11618))
- Fixed a SQL error that could occur on MySQL 5. ([#11596](https://github.com/craftcms/cms/issues/11596))
- Fixed an error that could occur when upgrading to Craft 4. ([#11644](https://github.com/craftcms/cms/issues/11644))
- Fixed a bug where deprecation warnings for treating an element query as an array weren’t getting logged with an origin, if they involved Twig’s `|batch` filter. ([#11597](https://github.com/craftcms/cms/issues/11597))
- Fixed a bug where `{% js %}`, `{% script %}`, and `{% css %}` tags weren’t registering JavaScript and CSS code properly when used within a `{% cache %}` tag that contained an ungenerated image transform. ([#11602](https://github.com/craftcms/cms/issues/11602))
- Fixed a bug where the “User saved” notification was translated for the former language, when changing the current user’s language preference.
Expand Down
10 changes: 8 additions & 2 deletions src/services/Fields.php
Original file line number Diff line number Diff line change
Expand Up @@ -1867,18 +1867,24 @@ private function _createLayoutQuery(): Query
*/
private function _createLayoutTabQuery(): Query
{
return (new Query())
$query = (new Query())
->select([
'id',
'layoutId',
'name',
'settings',
'elements',
'sortOrder',
'uid',
])
->from([Table::FIELDLAYOUTTABS])
->orderBy(['sortOrder' => SORT_ASC]);

// todo: remove this after the next breakpoint
if (version_compare(Craft::$app->schemaVersion, '4.0.0.1', '>=')) {
$query->addSelect('settings');
}

return $query;
}

/**
Expand Down

0 comments on commit dfd2ff6

Please sign in to comment.