diff -u b/core/modules/media/src/Controller/MediaController.php b/core/modules/media/src/Controller/MediaController.php --- b/core/modules/media/src/Controller/MediaController.php +++ b/core/modules/media/src/Controller/MediaController.php @@ -75,6 +75,7 @@ * {@inheritdoc} */ public function addTitle($entity_type_id, Request $request = NULL) { + $this->request = $request; $title = parent::addTitle($entity_type_id); // Change title for the file widget modal. diff -u b/core/modules/media/src/MediaForm.php b/core/modules/media/src/MediaForm.php --- b/core/modules/media/src/MediaForm.php +++ b/core/modules/media/src/MediaForm.php @@ -258,6 +258,7 @@ if ($fids) { $url = Url::fromRoute('entity.media.add_page', [], [ 'query' => [ + 'modal' => 'media_file', 'field_id' => $field_id, 'fids' => $fids, ], reverted: --- b/core/modules/media/src/Plugin/media/Source/File.php +++ a/core/modules/media/src/Plugin/media/Source/File.php @@ -93,11 +93,11 @@ $mimetype = $file->getMimeType(); $mimetype = explode('/', $mimetype); + $icon_names = array( - $icon_names = [ $mimetype[0] . '--' . $mimetype[1], $mimetype[1], $mimetype[0], + ); - ]; foreach ($icon_names as $icon_name) { $thumbnail = $icon_base . '/' . $icon_name . '.png'; if (is_file($thumbnail)) {