Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2725425 by mfb: Incorrect mime type on generated images

8.2.x
Alex Pott 2016-06-08 10:22:56 +01:00
parent 15b999d16b
commit f8f34be243
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
View File

@ -343,7 +343,7 @@ class ImageItem extends FileItem {
$image = File::create();
$image->setFileUri($path);
$image->setOwnerId(\Drupal::currentUser()->id());
$image->setMimeType('image/' . pathinfo($path, PATHINFO_EXTENSION));
$image->setMimeType(\Drupal::service('file.mime_type.guesser')->guess($path));
$image->setFileName(drupal_basename($path));
$destination_dir = static::doGetUploadLocation($settings);
file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);

4
core/modules/image/tests/src/Kernel/ImageItemTest.php
View File

@ -53,6 +53,9 @@ class ImageItemTest extends FieldKernelTestBase {
'entity_type' => 'entity_test',
'field_name' => 'image_test',
'bundle' => 'entity_test',
'settings' => [
'file_extensions' => 'jpg',
],
])->save();
file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
$this->image = File::create([
@ -123,6 +126,7 @@ class ImageItemTest extends FieldKernelTestBase {
$entity = EntityTest::create();
$entity->image_test->generateSampleItems();
$this->entityValidateAndSave($entity);
$this->assertEqual($entity->image_test->entity->get('filemime')->value, 'image/jpeg');
}
}