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

Update to Drupal 8.1.1. For more information, see https://www.drupal.org/node/2718713

Browse source
This commit is contained in:
Pantheon Automation 2016-05-04 14:35:41 -07:00 • committed by Greg Anderson
parent c0a0d5a94c
commit 9eae24d844
669 changed files with 3873 additions and 1553 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/modules/block/src/Plugin/migrate/source/Block.php
View file

@ -63,7 +63,7 @@ class Block extends DrupalSqlBase {
*/
protected function initializeIterator() {
$this->defaultTheme = $this->variableGet('theme_default', 'Garland');
$this->adminTheme = $this->variableGet('admin_theme', null);
$this->adminTheme = $this->variableGet('admin_theme', NULL);
return parent::initializeIterator();
}

3
core/modules/block/src/Tests/BlockLanguageTest.php
View file

@ -150,7 +150,8 @@ class BlockLanguageTest extends WebTestBase {
$this->drupalGet('node', ['query' => ['language' => 'fr']]);
$this->assertText('Powered by Drupal', 'The body of the block appears on the page.');
// Re-login in order to clear the interface language stored in the session.
// Log in again in order to clear the interface language stored in the
// session.
$this->drupalLogout();
$this->drupalLogin($this->adminUser);

2
core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
View file

@ -42,7 +42,7 @@ class BlockContextMappingUpdateTest extends UpdatePathTestBase {
// Disable maintenance mode.
\Drupal::state()->set('system.maintenance_mode', FALSE);
// We finished updating so we can login the user now.
// We finished updating so we can log in the user now.
$this->drupalLogin($this->rootUser);
// The block that we are testing has the following visibility rules:

1
core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php
View file

@ -76,4 +76,3 @@ class TestAccessBlock extends BlockBase implements ContainerFactoryPluginInterfa
}
}