opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.9. For more information, see https://www.drupal.org/project/drupal/releases/8.1.9

Browse source
This commit is contained in:
Pantheon Automation 2016-09-07 13:26:21 -07:00 • committed by Greg Anderson
parent f9f23cdf38
commit 09b113657a
125 changed files with 2307 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/modules/config/src/StorageReplaceDataWrapper.php
View file

@ -44,6 +44,7 @@ class StorageReplaceDataWrapper implements StorageInterface {
public function __construct(StorageInterface $storage, $collection = StorageInterface::DEFAULT_COLLECTION) {
$this->storage = $storage;
$this->collection = $collection;
$this->replacementData[$collection] = [];
}
/**
@ -104,7 +105,7 @@ class StorageReplaceDataWrapper implements StorageInterface {
$this->replacementData[$this->collection][$new_name] = $this->replacementData[$this->collection][$name];
unset($this->replacementData[$this->collection][$name]);
}
return $this->rename($name, $new_name);
return $this->storage->rename($name, $new_name);
}
/**
@ -164,8 +165,10 @@ class StorageReplaceDataWrapper implements StorageInterface {
* {@inheritdoc}
*/
public function createCollection($collection) {
$this->collection = $collection;
return $this->storage->createCollection($collection);
return new static(
$this->storage->createCollection($collection),
$collection
);
}
/**

5
core/modules/config/src/Tests/ConfigSingleImportExportTest.php
View file

@ -20,7 +20,10 @@ class ConfigSingleImportExportTest extends WebTestBase {
public static $modules = [
'block',
'config',
'config_test'
'config_test',
// Adding language module makes it possible to involve non-default
// (language.xx) collections in import/export operations.
'language',
];
protected function setUp() {