summaryrefslogtreecommitdiffstatshomepage
path: root/core
diff options
context:
space:
mode:
authorAlex Pott <alex.a.pott@googlemail.com>2013-10-11 17:28:28 +0100
committerAlex Pott <alex.a.pott@googlemail.com>2013-10-11 17:28:28 +0100
commit6ec7f3df01e618d50a00025fca714c0d398ee476 (patch)
treed251547747b95f4e2dee440c73b71420dd42a088 /core
parent26b6a6838581797bfaf65f8ab95fd112cfb006b0 (diff)
downloaddrupal-6ec7f3df01e618d50a00025fca714c0d398ee476.tar.gz
drupal-6ec7f3df01e618d50a00025fca714c0d398ee476.zip
Issue followup #1829224 by ianmthomasuk: Convert the 'theme_default' variable to CMI.
Diffstat (limited to 'core')
-rw-r--r--core/modules/block/lib/Drupal/block/Tests/BlockTest.php2
-rw-r--r--core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
index 681e67d4cff..fe1dca18eb1 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
@@ -178,7 +178,7 @@ class BlockTest extends BlockTestBase {
$title = $this->randomName(8);
$machine_name = strtolower($this->randomName(8));
// Enable a standard block.
- $default_theme = variable_get('theme_default', 'stark');
+ $default_theme = \Drupal::config('system.theme')->get('default') ?: 'stark';
$edit = array(
'machine_name' => $machine_name,
'region' => 'sidebar_first',
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index f7e06908fe7..8316c8b72a5 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -394,7 +394,7 @@ class MenuTest extends MenuWebTestBase {
$this->drupalPostForm('admin/structure/menu/manage/main', $edit, t('Save'));
// Make sure menu shows up with new name in block addition.
- $default_theme = variable_get('theme_default', 'stark');
+ $default_theme = \Drupal::config('system.theme')->get('default') ?: 'stark';
$this->drupalget('admin/structure/block/list/' . $default_theme);
$this->assertText($edit['label']);
}