Skip to content

Commit

Permalink
Merge branch '4.x' into 4.12
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Sep 3, 2024
2 parents 0ed9968 + 32226fa commit 48d0bb5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Fixed a SQL error that occurred when running the `db/convert-charset` command if there were any custom database views or sequences. ([#15598](https://github.com/craftcms/cms/issues/15598))
- Fixed a bug where `craft\helpers\Db::supportsTimeZones()` could return `false` on databases that supported time zone conversion. ([#15592](https://github.com/craftcms/cms/issues/15592))
- Fixed a bug where Assets fields were validating settings that weren’t applicable depending on the “Restrict assets to a single location” setting. ([#15545](https://github.com/craftcms/cms/issues/15545))
- Fixed a bug where `null` values within associative arrays were ignored when applying project config data. ([#10512](https://github.com/craftcms/cms/issues/10512))

## 4.11.5 - 2024-08-26

Expand Down
2 changes: 1 addition & 1 deletion src/helpers/ProjectConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ public static function unpackAssociativeArray(array $array, bool $recursive = tr
$associative = [];
if (!empty($array[ProjectConfigService::ASSOC_KEY])) {
foreach ($array[ProjectConfigService::ASSOC_KEY] as $items) {
if (!isset($items[0], $items[1])) {
if (!array_key_exists(0, $items) || !array_key_exists(1, $items)) {
Craft::warning('Skipping incomplete packed associative array data', __METHOD__);
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/translations/nl/app.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 48d0bb5

Please sign in to comment.