X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fmedia%2Fsrc%2FMediaSourceBase.php;h=c01b9946ea0f8e54330acd3ba50ef7fd2d2cb8ce;hb=4f1b9b4ab48a8498afac9e2213a02a23ccf4a06c;hp=1edc8584508e693a6ee274ac328afaa7edaccfd7;hpb=af6d1fb995500ae68849458ee10d66abbdcfb252;p=yaffs-website

diff --git a/web/core/modules/media/src/MediaSourceBase.php b/web/core/modules/media/src/MediaSourceBase.php
index 1edc85845..c01b9946e 100644
--- a/web/core/modules/media/src/MediaSourceBase.php
+++ b/web/core/modules/media/src/MediaSourceBase.php
@@ -301,7 +301,9 @@ abstract class MediaSourceBase extends PluginBase implements MediaSourceInterfac
    *   returned. Otherwise, a new, unused one is generated.
    */
   protected function getSourceFieldName() {
-    $base_id = 'field_media_' . $this->getPluginId();
+    // Some media sources are using a deriver, so their plugin IDs may contain
+    // a separator (usually ':') which is not allowed in field names.
+    $base_id = 'field_media_' . str_replace(static::DERIVATIVE_SEPARATOR, '_', $this->getPluginId());
     $tries = 0;
     $storage = $this->entityTypeManager->getStorage('field_storage_config');