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
/
Plugin
/
DefaultSingleLazyPluginCollection.php
diff --git
a/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
b/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
index 519e93d639053cbce39a49eb722db10a74595f70..e2bff29422aa393db072469f90fd3743fa9be3eb 100644
(file)
--- a/
web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
+++ b/
web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
@@
-52,10
+52,7
@@
class DefaultSingleLazyPluginCollection extends LazyPluginCollection {
*/
public function __construct(PluginManagerInterface $manager, $instance_id, array $configuration) {
$this->manager = $manager;
*/
public function __construct(PluginManagerInterface $manager, $instance_id, array $configuration) {
$this->manager = $manager;
- $this->instanceId = $instance_id;
- // This is still needed by the parent LazyPluginCollection class.
- $this->instanceIDs = [$instance_id => $instance_id];
- $this->configuration = $configuration;
+ $this->addInstanceId($instance_id, $configuration);
}
/**
}
/**
@@
-95,6
+92,8
@@
class DefaultSingleLazyPluginCollection extends LazyPluginCollection {
*/
public function addInstanceId($id, $configuration = NULL) {
$this->instanceId = $id;
*/
public function addInstanceId($id, $configuration = NULL) {
$this->instanceId = $id;
+ // Reset the list of instance IDs since there can be only one.
+ $this->instanceIDs = [];
parent::addInstanceId($id, $configuration);
if ($configuration !== NULL) {
$this->setConfiguration($configuration);
parent::addInstanceId($id, $configuration);
if ($configuration !== NULL) {
$this->setConfiguration($configuration);