projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to Drupal 8.6.4, which is PHP 7.3 friendly. Also updated HTMLaw library....
[yaffs-website]
/
web
/
core
/
modules
/
media
/
src
/
MediaSourceBase.php
diff --git
a/web/core/modules/media/src/MediaSourceBase.php
b/web/core/modules/media/src/MediaSourceBase.php
index 1edc8584508e693a6ee274ac328afaa7edaccfd7..c01b9946ea0f8e54330acd3ba50ef7fd2d2cb8ce 100644
(file)
--- 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() {
* 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');
$tries = 0;
$storage = $this->entityTypeManager->getStorage('field_storage_config');