Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2
This commit is contained in:
parent
9eae24d844
commit
28556d630e
1322 changed files with 6699 additions and 2064 deletions
|
@ -17,7 +17,7 @@ interface ContextHandlerInterface {
|
|||
*
|
||||
* @param \Drupal\Component\Plugin\Context\ContextInterface[] $contexts
|
||||
* An array of contexts.
|
||||
* @param array $definitions .
|
||||
* @param array $definitions
|
||||
* An array of plugin definitions.
|
||||
*
|
||||
* @return array
|
||||
|
|
|
@ -82,11 +82,11 @@ class DefaultSingleLazyPluginCollection extends LazyPluginCollection {
|
|||
* {@inheritdoc}
|
||||
*/
|
||||
public function setConfiguration($configuration) {
|
||||
$this->configuration = $configuration;
|
||||
$plugin = $this->get($this->instanceId);
|
||||
if ($plugin instanceof ConfigurablePluginInterface) {
|
||||
$plugin->setConfiguration($configuration);
|
||||
}
|
||||
$this->configuration = $configuration;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
@ -94,6 +94,7 @@ class DefaultSingleLazyPluginCollection extends LazyPluginCollection {
|
|||
* {@inheritdoc}
|
||||
*/
|
||||
public function addInstanceId($id, $configuration = NULL) {
|
||||
$this->instanceId = $id;
|
||||
parent::addInstanceId($id, $configuration);
|
||||
if ($configuration !== NULL) {
|
||||
$this->setConfiguration($configuration);
|
||||
|
|
|
@ -55,4 +55,5 @@ class HookDiscovery implements DiscoveryInterface {
|
|||
}
|
||||
return $definitions;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -101,4 +101,5 @@ class YamlDiscovery implements DiscoveryInterface {
|
|||
|
||||
return $definitions;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Reference in a new issue