Skip to content
Snippets Groups Projects
Commit e8770ec9 authored by Veronica Severyn's avatar Veronica Severyn Committed by Marco Fernandes
Browse files

Issue #3446791. Broken media URLs when using filefield_paths on the media type

parent 44851e61
No related branches found
No related tags found
1 merge request!126Issue #3446791. Broken media URLs when using filefield_paths on the media type
Pipeline #181953 passed with warnings
......@@ -9,7 +9,9 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Render\RendererInterface;
use Drupal\editor\Entity\Editor;
use Drupal\file\Entity\File as CoreFile;
use Drupal\file\FileInterface;
use Drupal\filefield_paths\Utility\FieldItem;
use Drupal\gutenberg\DataProvider\EntityDataProviderManager;
use Drupal\gutenberg\MediaEntityRendererInterface;
use Drupal\gutenberg\MediaTypeGuesserInterface;
......@@ -283,6 +285,20 @@ class MediaService {
throw new MediaEntityNotSavedException();
}
if ($this->moduleHandler->moduleExists('filefield_paths')) {
$field_definition = $media_entity->getSource()
->getSourceFieldDefinition($media_entity->bundle->entity);
$field_name = $field_definition->getName();
if (FieldItem::hasConfigurationEnabled($media_entity->get($field_name))) {
// File location might have changed. Refresh file entity data.
$fid = $file_entity->id();
if (is_numeric($fid)) {
$file_entity = CoreFile::load($fid);
}
}
}
return $this->entityDataProviderManager->getData('media', $file_entity, [
'media_id' => $media_entity->id(),
'media_type' => $media_entity->bundle(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment