Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / modules / contrib / entityqueue / src / EntityQueueHandlerPluginCollection.php

diff --git a/web/modules/contrib/entityqueue/src/EntityQueueHandlerPluginCollection.php b/web/modules/contrib/entityqueue/src/EntityQueueHandlerPluginCollection.php
index 871552d2ba83e4f6e09c22a5108c439fb95449e6..fe2d20a0ba1f99843b8d0479e774d07685005558 100644 (file)
--- a/web/modules/contrib/entityqueue/src/EntityQueueHandlerPluginCollection.php
+++ b/web/modules/contrib/entityqueue/src/EntityQueueHandlerPluginCollection.php
@@ -30,9 +30,9 @@ class EntityQueueHandlerPluginCollection extends DefaultSingleLazyPluginCollecti
    *   The entity queue using this plugin.
    */
   public function __construct(PluginManagerInterface $manager, $instance_id, array $configuration, EntityQueueInterface $queue) {
-    parent::__construct($manager, $instance_id, $configuration);
-
     $this->queue = $queue;
+
+    parent::__construct($manager, $instance_id, $configuration);
   }
 
   /**
@@ -53,15 +53,4 @@ class EntityQueueHandlerPluginCollection extends DefaultSingleLazyPluginCollecti
     $this->pluginInstances[$instance_id]->setQueue($this->queue);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function addInstanceId($id, $configuration = NULL) {
-    // @todo Open a core bug report, the parent class should take care of this..
-    $this->instanceId = $id;
-    $this->instanceIDs = array_filter($this->instanceIDs);
-
-    parent::addInstanceId($id, $configuration);
-  }
-
 }