Issue #3466462 by mfb, chandansha, kim.pepper, charlliequadros, smustgrave, mxr576, quietone, morvaim, larowlan: Fix handling of unknown file extensions in FileMediaFormatterBase
(cherry picked from commit ec3fedad1d
)
merge-requests/10915/head
parent
c0adde8b3b
commit
5143962686
|
@ -81,7 +81,7 @@ abstract class FileMediaFormatterBase extends FileFormatterBase implements FileM
|
|||
|
||||
foreach ($extension_list as $extension) {
|
||||
$mime_type = $extension_mime_type_guesser->guessMimeType('fakedFile.' . $extension);
|
||||
if (static::mimeTypeApplies($mime_type)) {
|
||||
if ($mime_type !== NULL && static::mimeTypeApplies($mime_type)) {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
@ -192,11 +192,12 @@ abstract class FileMediaFormatterBase extends FileFormatterBase implements FileM
|
|||
// grouping in case the multiple file behavior is not 'tags'.
|
||||
/** @var \Drupal\file\Entity\File $file */
|
||||
foreach ($this->getEntitiesToView($items, $langcode) as $file) {
|
||||
if (static::mimeTypeApplies($file->getMimeType())) {
|
||||
$mime_type = $file->getMimeType();
|
||||
if ($mime_type !== NULL && static::mimeTypeApplies($mime_type)) {
|
||||
$source_attributes = new Attribute();
|
||||
$source_attributes
|
||||
->setAttribute('src', $file->createFileUrl())
|
||||
->setAttribute('type', $file->getMimeType());
|
||||
->setAttribute('type', $mime_type);
|
||||
if ($this->getSetting('multiple_file_display_type') === 'tags') {
|
||||
$source_files[] = [
|
||||
[
|
||||
|
|
|
@ -24,7 +24,8 @@ class FileAudioFormatterTest extends FileMediaFormatterTestBase {
|
|||
* @dataProvider dataProvider
|
||||
*/
|
||||
public function testRender($tag_count, $formatter_settings): void {
|
||||
$field_config = $this->createMediaField('file_audio', 'mp3', $formatter_settings);
|
||||
// Create a file field that accepts .mp3 and an unknown file extension.
|
||||
$field_config = $this->createMediaField('file_audio', 'unknown-extension, mp3', $formatter_settings);
|
||||
|
||||
file_put_contents('public://file.mp3', str_repeat('t', 10));
|
||||
$file1 = File::create([
|
||||
|
|
Loading…
Reference in New Issue