Skip to content

Commit

Permalink
Merge branch 'release/4.4.14' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Jun 13, 2023
2 parents 82629ee + cefd944 commit 31c6d40
Show file tree
Hide file tree
Showing 46 changed files with 415 additions and 271 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Release Notes for Craft CMS 4

## 4.4.14 - 2023-06-13

- The `utils/fix-field-layout-uids` command now adds missing field layout component UUIDs.
- The `_includes/forms/date` and `_includes/forms/time` templates now accept a `timeZone` variable.
- Invalid utility URLs now redirect to the first permitted utility (besides “Updates”). ([#13282](https://github.com/craftcms/cms/issues/13282))
- Fixed an error that could occur when updating a plugin with the `craft update` command, if it provided a new migration but still had the same schema version.
- Fixed an error that occurred when rendering editable tables with Date or Time columns. ([#13270](https://github.com/craftcms/cms/issues/13270))
- Fixed a bug where CSS classes that contained a pseudo-selector weren’t getting namespaced. ([#13251](https://github.com/craftcms/cms/pull/13251))
- Fixed a JavaScript error that could occur when renaming assets without URLs. ([#13223](https://github.com/craftcms/cms/pull/13223))
- Fixed a bug where `craft\base\Element::setFieldValuesFromRequest()` wasn’t properly handling empty strings passed as the namespace. ([#13252](https://github.com/craftcms/cms/discussions/13252))
- Fixed a styling issue with control panel notifications. ([#13258](https://github.com/craftcms/cms/pull/13258))
- Fixed a bug where element thumbnails could stop getting loaded when quickly switching between element sources. ([#13253](https://github.com/craftcms/cms/issues/13253))
- Fixed an error that occurred when uploading an asset with a filename over 232 characters long, directly to an Assets field. ([#13264](https://github.com/craftcms/cms/issues/13264))
- Fixed an error that occurred when transforming an image with a filename over 232 characters long. ([#13266](https://github.com/craftcms/cms/pull/13266))
- Fixed a SQL error that could occur when upgrading to 4.4 on PostgreSQL, if the database was converted from MySQL. ([#12855](https://github.com/craftcms/cms/issues/12855))
- Fixed a bug where `craft\db\Query::collect()` was returning a `craft\elements\ElementCollection` instance.
- Fixed a SQL error that could occur when upgrading to Craft 4 if any database tables had foreign keys to `entryversions` or other now-unused tables that are removed during the upgrade.
- Fixed a bug where the `users/save-user` action wasn’t including user details in successful responses. ([#13267](https://github.com/craftcms/cms/issues/13267))
- Fixed a PHP error that occurred if an asset without a `dateModified` value was passed to `craft\helpers\Assets::revParams()`. ([#13268](https://github.com/craftcms/cms/pull/13268))
- Fixed a bug where the Updates utility’s heading wasn’t reflecting updates that were blocked due to an expired plugin. ([#13274](https://github.com/craftcms/cms/issues/13274))
- Fixed a bug where element deletion events weren’t getting triggered when elements were hard-deleted from an element index. ([#13280](https://github.com/craftcms/cms/issues/13280))
- Fixed a bug where dropdowns within editable tables had blank optgroup labels. ([#13298](https://github.com/craftcms/cms/issues/13298))
- Fixed a bug where textual cells within editable tables would display `[object Object]` if an object was passed as their value. ([#13303](https://github.com/craftcms/cms/issues/13303))

## 4.4.13 - 2023-05-24

- Fixed a bug where asset sources weren‘t immediately showing a source path on a clear `localStorage` cache.
Expand Down
79 changes: 40 additions & 39 deletions composer.lock

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

26 changes: 26 additions & 0 deletions src/base/ApplicationTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,32 @@ trait ApplicationTrait
*/
private bool $_waitingToSaveInfo = false;

/**
* @inheritdoc
*/
public function setVendorPath($path): void
{
parent::setVendorPath($path);

// Override the @bower and @npm aliases if using asset-packagist.org
// todo: remove this whenever Yii is updated with support for asset-packagist.org
$altBowerPath = $this->getVendorPath() . DIRECTORY_SEPARATOR . 'bower-asset';
$altNpmPath = $this->getVendorPath() . DIRECTORY_SEPARATOR . 'npm-asset';
if (is_dir($altBowerPath)) {
Craft::setAlias('@bower', $altBowerPath);
}
if (is_dir($altNpmPath)) {
Craft::setAlias('@npm', $altNpmPath);
}

// Override where Yii should find its asset deps
$assetsPath = Craft::getAlias('@craft') . '/web/assets';
Craft::setAlias('@bower/jquery/dist', $assetsPath . '/jquery/dist');
Craft::setAlias('@bower/inputmask/dist', $assetsPath . '/inputmask/dist');
Craft::setAlias('@bower/punycode', $assetsPath . '/punycode/dist');
Craft::setAlias('@bower/yii2-pjax', $assetsPath . '/yii2pjax/dist');
}

/**
* Sets the target application language.
*
Expand Down
10 changes: 7 additions & 3 deletions src/base/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -4210,7 +4210,12 @@ public function markAsClean(): void
public function setFieldValuesFromRequest(string $paramNamespace = ''): void
{
$this->setFieldParamNamespace($paramNamespace);
$values = Craft::$app->getRequest()->getBodyParam($paramNamespace, []);

if (isset($this->_fieldParamNamePrefix)) {
$values = Craft::$app->getRequest()->getBodyParam($paramNamespace, []);
} else {
$values = Craft::$app->getRequest()->getBodyParams();
}

// Run through this multiple times, in case any fields become visible as a result of other field value changes
$processedFields = [];
Expand All @@ -4231,7 +4236,6 @@ public function setFieldValuesFromRequest(string $paramNamespace = ''): void
$value = $values[$field->handle];
} elseif (
isset($this->_fieldParamNamePrefix) &&
$this->_fieldParamNamePrefix !== '' &&
UploadedFile::getInstancesByName("$this->_fieldParamNamePrefix.$field->handle")
) {
// A file was uploaded for this field
Expand Down Expand Up @@ -4265,7 +4269,7 @@ public function getFieldParamNamespace(): ?string
*/
public function setFieldParamNamespace(string $namespace): void
{
$this->_fieldParamNamePrefix = $namespace;
$this->_fieldParamNamePrefix = $namespace !== '' ? $namespace : null;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/base/ElementInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

/**
* ElementInterface defines the common interface to be implemented by element classes.
* A class implementing this interface should also use [[ElementTrait]] and [[ContentTrait]].
* A class implementing this interface should also use [[ElementTrait]].
*
* @mixin ElementTrait
* @mixin CustomFieldBehavior
Expand Down
2 changes: 1 addition & 1 deletion src/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
return [
'id' => 'CraftCMS',
'name' => 'Craft CMS',
'version' => '4.4.13',
'version' => '4.4.14',
'schemaVersion' => '4.4.0.4',
'minVersionRequired' => '3.7.11',
'basePath' => dirname(__DIR__), // Defines the @app alias
Expand Down
Loading

0 comments on commit 31c6d40

Please sign in to comment.