projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
web
/
core
/
lib
/
Drupal
/
Core
/
Entity
/
Entity
/
EntityViewDisplay.php
diff --git
a/web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
b/web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
index 7c7d62e04da3bfe0f5851b67efacbc7110cd41a6..cd36418d14ea62291363bc84db9d377d6cd9a875 100644
(file)
--- a/
web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
+++ b/
web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
@@
-201,7
+201,7
@@
class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
'view_mode' => $this->originalMode,
// No need to prepare, defaults have been merged in setComponent().
'prepare' => FALSE,
'view_mode' => $this->originalMode,
// No need to prepare, defaults have been merged in setComponent().
'prepare' => FALSE,
- 'configuration' => $configuration
+ 'configuration' => $configuration
,
]);
}
else {
]);
}
else {
@@
-301,7
+301,7
@@
class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
}
return [
}
return [
- 'formatters' => new EntityDisplayPluginCollection($this->pluginManager, $configurations)
+ 'formatters' => new EntityDisplayPluginCollection($this->pluginManager, $configurations)
,
];
}
];
}