Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2112233 by alexpott, amateescu: Remove unnecessary ternaries in around config()->get().

8.0.x
Dries 2013-10-21 16:32:59 -04:00
parent 4a7a8b3c56
commit 8f6cb3480c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/block/lib/Drupal/block/Tests/BlockTest.php
View File

@ -177,7 +177,7 @@ class BlockTest extends BlockTestBase {
$title = $this->randomName(8); $title = $this->randomName(8);
$id = strtolower($this->randomName(8)); $id = strtolower($this->randomName(8));
// Enable a standard block. // Enable a standard block.
$default_theme = \Drupal::config('system.theme')->get('default') ?: 'stark'; $default_theme = \Drupal::config('system.theme')->get('default');
$edit = array( $edit = array(
'id' => $id, 'id' => $id,
'region' => 'sidebar_first', 'region' => 'sidebar_first',

2
core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
View File

@ -394,7 +394,7 @@ class MenuTest extends MenuWebTestBase {
$this->drupalPostForm('admin/structure/menu/manage/main', $edit, t('Save')); $this->drupalPostForm('admin/structure/menu/manage/main', $edit, t('Save'));
// Make sure menu shows up with new name in block addition. // Make sure menu shows up with new name in block addition.
$default_theme = \Drupal::config('system.theme')->get('default') ?: 'stark'; $default_theme = \Drupal::config('system.theme')->get('default');
$this->drupalget('admin/structure/block/list/' . $default_theme); $this->drupalget('admin/structure/block/list/' . $default_theme);
$this->assertText($edit['label']); $this->assertText($edit['label']);
} }

2
core/modules/system/system.module
View File

@ -222,7 +222,7 @@ function system_permission() {
), ),
'view the administration theme' => array( 'view the administration theme' => array(
'title' => t('View the administration theme'), 'title' => t('View the administration theme'),
'description' => \Drupal::config('system.theme')->get('admin') ?: t('This is only used when the site is configured to use a separate administration theme on the <a href="@appearance-url">Appearance</a> page.', array('@appearance-url' => url('admin/appearance'))), 'description' => t('This is only used when the site is configured to use a separate administration theme on the <a href="@appearance-url">Appearance</a> page.', array('@appearance-url' => url('admin/appearance'))),
), ),
'access site reports' => array( 'access site reports' => array(
'title' => t('View site reports'), 'title' => t('View site reports'),