Skip to content

Commit

Permalink
Fixed #2354
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Jan 25, 2018
1 parent 6feefee commit 9abc1b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- Fixed a bug where the Debug Toolbar was showing the Yii logo instead of the Craft logo in the Control Panel. ([#2348](https://github.com/craftcms/cms/issues/2348))
- Fixed a bug where Single entries’ titles were always reset to their section name when saving their section’s settings. ([#2349](https://github.com/craftcms/cms/issues/2349))
- Fixed a bug where Singles’ dynamic entry title formats were not getting applied.
- Fixed an error that occurred when calling `craft\helpers\Assets::getFileKindLabel()` if the file kind was unknown. ([#2354](https://github.com/craftcms/cms/issues/2354))

## 3.0.0-RC7.1 - 2018-01-24

Expand Down
7 changes: 1 addition & 6 deletions src/helpers/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,7 @@ public static function getFileKinds(): array
public static function getFileKindLabel(string $kind): string
{
self::_buildFileKinds();

if (isset(self::$_fileKinds[$kind]['label'])) {
return self::$_fileKinds[$kind]['label'];
}

return null;
return self::$_fileKinds[$kind]['label'] ?? Asset::KIND_UNKNOWN;
}

/**
Expand Down

0 comments on commit 9abc1b1

Please sign in to comment.